patches/strace/4.5.15/180-undef-PACKET_MEMBERSHIP.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
parent 746 b150d6f590fc
permissions -rw-r--r--
libg/eglibc: add updated eglibc 2.15

Includes a patch to remove __builtin_expect test:

In eglibc-2.15, the build breaks in configure while testing
for the existance of __builtin_expect. It fails with newer
versions of gcc.

This patch is a modification of an upstream change in glibc
mainline (to be 2.16) to fix the following error:

[CFG ] checking for __builtin_expect... no
[ERROR] configure: error: support for __builtin_expect needed

http://sourceware.org/git/?p=glibc.git;a=commit;h=3857022a761ea7251f8e5c0e45d382ebc3e34cf9

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: coalesce both patches into a single changeset]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@257
     1
diff -dur strace-4.5.15.orig/net.c strace-4.5.15/net.c
yann@257
     2
--- strace-4.5.15.orig/net.c	2006-12-13 20:57:23.000000000 +0100
yann@257
     3
+++ strace-4.5.15/net.c	2007-07-14 19:29:36.000000000 +0200
yann@257
     4
@@ -800,8 +800,12 @@
yann@257
     5
 
yann@257
     6
 #ifdef SOL_PACKET
yann@257
     7
 static const struct xlat sockpacketoptions[] = {
yann@257
     8
+#if defined(PACKET_ADD_MEMBERSHIP)
yann@257
     9
 	{ PACKET_ADD_MEMBERSHIP,	"PACKET_ADD_MEMBERSHIP"	},
yann@257
    10
+#endif
yann@257
    11
+#if defined(PACKET_DROP_MEMBERSHIP)
yann@257
    12
 	{ PACKET_DROP_MEMBERSHIP,	"PACKET_DROP_MEMBERSHIP"},
yann@257
    13
+#endif
yann@257
    14
 #if defined(PACKET_RECV_OUTPUT)
yann@257
    15
 	{ PACKET_RECV_OUTPUT,		"PACKET_RECV_OUTPUT"	},
yann@257
    16
 #endif