patches/strace/4.5.15/180-undef-PACKET_MEMBERSHIP.patch
author Oron Peled <oron@actcom.co.il>
Mon Aug 03 00:49:25 2009 +0200 (2009-08-03)
branch1.4
changeset 1456 94fc77c37418
parent 746 b150d6f590fc
permissions -rw-r--r--
[complib:mpfr] Fix building MPFR in some weird cases

The tmul test uses a compiled-in input file in $(srcdir).
The problem is that the Makefile passes it unquoted. The C code
tries to stringify it using clever macros, which may *usually* work.

In my case the source directory was named:
.../toolchain-powerpc-e500v2-linux-gnuspe-1.0-2.fc10/.../tests
And guess what? During testing I found out the program fails because
it tries to open:
.../toolchain-powerpc-e500v2-1-gnuspe-1.0-2.fc10/.../tests

Yes, CPP tokenized the macro before stringifying it and not surprisingly
the 'linux' part was converted to 1.
[on Fedora-10: cpp (GCC) 4.3.2 20081105 (Red Hat 4.3.2-7)]

So the attached patch simplify the macros and pass the path as string
from the Makefile.

Manually backported from 1449:8ad2773e7ae3
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