patches/strace/4.5.15/180-undef-PACKET_MEMBERSHIP.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
parent 746 b150d6f590fc
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
(transplanted from 1ba79f2126df8bd89120899a58f2d0bcc2e9c771)
     1 diff -dur strace-4.5.15.orig/net.c strace-4.5.15/net.c
     2 --- strace-4.5.15.orig/net.c	2006-12-13 20:57:23.000000000 +0100
     3 +++ strace-4.5.15/net.c	2007-07-14 19:29:36.000000000 +0200
     4 @@ -800,8 +800,12 @@
     5  
     6  #ifdef SOL_PACKET
     7  static const struct xlat sockpacketoptions[] = {
     8 +#if defined(PACKET_ADD_MEMBERSHIP)
     9  	{ PACKET_ADD_MEMBERSHIP,	"PACKET_ADD_MEMBERSHIP"	},
    10 +#endif
    11 +#if defined(PACKET_DROP_MEMBERSHIP)
    12  	{ PACKET_DROP_MEMBERSHIP,	"PACKET_DROP_MEMBERSHIP"},
    13 +#endif
    14  #if defined(PACKET_RECV_OUTPUT)
    15  	{ PACKET_RECV_OUTPUT,		"PACKET_RECV_OUTPUT"	},
    16  #endif