Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.3.6/290-gcc-4.3-include.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
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. 
     1 GCC trunk now has multiple internal headers directories, one

     2 containing the self-contained GCC-provided headers and one containing

     3 the <limits.h> (not self-contained but including libc's <limits.h> or

     4 a fixed version thereof) and the fixed headers; more such directories

     5 may be added in future.

     6 

     7 When glibc uses -nostdinc, it needs to use -isystem options for all

     8 these internal directories.  This patch teaches it about the

     9 include-fixed directory (and is harmless with old GCC versions without

    10 that directory).

    11 

    12 2007-03-18  Joseph Myers  <joseph@codesourcery.com>

    13 

    14 	* configure.in: Also pass -isystem option for GCC's include-fixed

    15 	directory.

    16 	* configure: Regenerate.

    17 

    18 

    19 --- glibc-2.3.6.ori/configure.in	2008-10-22 14:55:58.000000000 +0200

    20 +++ glibc-2.3.6/configure.in	2008-10-22 14:56:15.000000000 +0200

    21 @@ -804,7 +804,7 @@

    22  # thing on a system that doesn't need fixincludes.  (Not presently a problem.)

    23  if test -n "$sysheaders"; then

    24    ccheaders=`$CC -print-file-name=include`

    25 -  SYSINCLUDES="-nostdinc -isystem $ccheaders \

    26 +  SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \

    27  -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"

    28  fi

    29  AC_SUBST(SYSINCLUDES)

    30 --- glibc-2.3.6.ori/configure	2008-10-22 15:11:37.000000000 +0200

    31 +++ glibc-2.3.6/configure	2008-10-22 15:11:54.000000000 +0200

    32 @@ -4438,7 +4438,7 @@

    33  # thing on a system that doesn't need fixincludes.  (Not presently a problem.)

    34  if test -n "$sysheaders"; then

    35    ccheaders=`$CC -print-file-name=include`

    36 -  SYSINCLUDES="-nostdinc -isystem $ccheaders \

    37 +  SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \

    38  -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"

    39  fi

    40
crosstool-ng