patches/strace/4.5.15/180-undef-PACKET_MEMBERSHIP.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 746 b150d6f590fc
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
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