patches/strace/4.5.15/170-undef-CTL_PROC.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/system.c strace-4.5.15/system.c
     2 --- strace-4.5.15.orig/system.c	2007-01-17 00:22:36.000000000 +0100
     3 +++ strace-4.5.15/system.c	2007-07-14 19:28:41.000000000 +0200
     4 @@ -1612,7 +1612,9 @@
     5  	{ CTL_KERN, "CTL_KERN" },
     6  	{ CTL_VM, "CTL_VM" },
     7  	{ CTL_NET, "CTL_NET" },
     8 +#ifdef CTL_PROC
     9  	{ CTL_PROC, "CTL_PROC" },
    10 +#endif
    11  	{ CTL_FS, "CTL_FS" },
    12  	{ CTL_DEBUG, "CTL_DEBUG" },
    13  	{ CTL_DEV, "CTL_DEV" },