patches/glibc/2.6.1/180-gcc-4.3-sysinclude-path.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
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)
yann@748
     1
Patch pointed to by Ryan ARNOLD on the libc-help ML.
yann@748
     2
See: http://sourceware.org/ml/libc-help/2008-06/msg00063.html
yann@748
     3
yann@748
     4
Forwarded to crosstool-NG by Ioannis E. VENETIS:
yann@748
     5
See: http://sourceware.org/ml/libc-help/2008-06/msg00063.html
yann@748
     6
yann@748
     7
GCC 4.3 changed the location of some of the header files.  I don't
yann@748
     8
understand why you'd be getting these errors while building GCC since
yann@748
     9
it provides them.
yann@748
    10
yann@748
    11
With regard to GLIBC, Roland checked in some changes so that the GLIBC
yann@748
    12
build system could find the new locations of the GCC provided header
yann@748
    13
files.
yann@748
    14
yann@748
    15
diff -durN glibc-2.6.1.orig/configure.in glibc-2.6.1/configure.in
yann@748
    16
--- glibc-2.6.1.orig/configure.in	2007-06-08 05:16:36.000000000 +0200
yann@748
    17
+++ glibc-2.6.1/configure.in	2008-06-24 18:38:46.000000000 +0200
yann@748
    18
@@ -911,8 +911,12 @@
yann@748
    19
 # header directory and add that to the list.  NOTE: Only does the right
yann@748
    20
 # thing on a system that doesn't need fixincludes.  (Not presently a problem.)
yann@748
    21
 if test -n "$sysheaders"; then
yann@748
    22
-  ccheaders=`$CC -print-file-name=include`
yann@748
    23
-  SYSINCLUDES="-nostdinc -isystem $ccheaders \
yann@748
    24
+  SYSINCLUDES=-nostdinc
yann@748
    25
+  for d in include include-fixed; do
yann@748
    26
+    i=`$CC -print-file-name="$d"` && test "x$i" != x && test "x$i" != "x$d" &&
yann@748
    27
+    SYSINCLUDES="$SYSINCLUDES -isystem $i"
yann@748
    28
+  done
yann@748
    29
+  SYSINCLUDES="$SYSINCLUDES \
yann@748
    30
 -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
yann@748
    31
   if test -n "$CXX"; then
yann@748
    32
     cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
yann@748
    33
diff -durN glibc-2.6.1.orig/configure glibc-2.6.1/configure
yann@748
    34
--- glibc-2.6.1.orig/configure	2008-06-24 18:35:34.000000000 +0200
yann@748
    35
+++ glibc-2.6.1/configure	2008-06-24 18:38:46.000000000 +0200
yann@748
    36
@@ -4562,8 +4562,12 @@
yann@748
    37
 # header directory and add that to the list.  NOTE: Only does the right
yann@748
    38
 # thing on a system that doesn't need fixincludes.  (Not presently a problem.)
yann@748
    39
 if test -n "$sysheaders"; then
yann@748
    40
-  ccheaders=`$CC -print-file-name=include`
yann@748
    41
-  SYSINCLUDES="-nostdinc -isystem $ccheaders \
yann@748
    42
+  SYSINCLUDES=-nostdinc
yann@748
    43
+  for d in include include-fixed; do
yann@748
    44
+    i=`$CC -print-file-name="$d"` && test "x$i" != "x$d" &&
yann@748
    45
+    SYSINCLUDES="$SYSINCLUDES -isystem $i"
yann@748
    46
+  done
yann@748
    47
+  SYSINCLUDES="$SYSINCLUDES \
yann@748
    48
 -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
yann@748
    49
   if test -n "$CXX"; then
yann@748
    50
     cxxversion=`$CXX -dumpversion 2>&5` &&