patches/glibc/2.7/180-gcc-4.3-sysinclude-path.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jan 17 23:06:02 2010 +0100 (2010-01-17)
changeset 1740 c57458bb354d
parent 747 d3e603e7c17c
permissions -rw-r--r--
configure: do not require hg when configuring in an hg clone

When configuring in an hg clone, we need hg to compute the version string.
It can happen that users do not have Mercurial (eg. if they got a snapshot
rather that they did a full clone). In this case, we can still run, of
course, so simply fill the version string with a sufficiently explicit
value, that does not require hg. The date is a good candidate.
yann@612
     1
Patch pointed to by Ryan ARNOLD on the libc-help ML.
yann@612
     2
See: http://sourceware.org/ml/libc-help/2008-06/msg00063.html
yann@612
     3
yann@612
     4
Forwarded to crosstool-NG by Ioannis E. VENETIS:
yann@612
     5
See: http://sourceware.org/ml/libc-help/2008-06/msg00063.html
yann@612
     6
yann@612
     7
GCC 4.3 changed the location of some of the header files.  I don't
yann@612
     8
understand why you'd be getting these errors while building GCC since
yann@612
     9
it provides them.
yann@612
    10
yann@612
    11
With regard to GLIBC, Roland checked in some changes so that the GLIBC
yann@612
    12
build system could find the new locations of the GCC provided header
yann@612
    13
files.
yann@612
    14
yann@612
    15
diff -durN glibc-2.7.orig/configure.in glibc-2.7/configure.in
yann@612
    16
--- glibc-2.7.orig/configure.in	2007-06-08 05:16:36.000000000 +0200
yann@612
    17
+++ glibc-2.7/configure.in	2008-06-24 18:38:46.000000000 +0200
yann@612
    18
@@ -911,8 +911,12 @@
yann@612
    19
 # header directory and add that to the list.  NOTE: Only does the right
yann@612
    20
 # thing on a system that doesn't need fixincludes.  (Not presently a problem.)
yann@612
    21
 if test -n "$sysheaders"; then
yann@612
    22
-  ccheaders=`$CC -print-file-name=include`
yann@612
    23
-  SYSINCLUDES="-nostdinc -isystem $ccheaders \
yann@612
    24
+  SYSINCLUDES=-nostdinc
yann@612
    25
+  for d in include include-fixed; do
yann@612
    26
+    i=`$CC -print-file-name="$d"` && test "x$i" != x && test "x$i" != "x$d" &&
yann@612
    27
+    SYSINCLUDES="$SYSINCLUDES -isystem $i"
yann@612
    28
+  done
yann@612
    29
+  SYSINCLUDES="$SYSINCLUDES \
yann@612
    30
 -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
yann@612
    31
   if test -n "$CXX"; then
yann@612
    32
     cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
yann@612
    33
diff -durN glibc-2.7.orig/configure glibc-2.7/configure
yann@612
    34
--- glibc-2.7.orig/configure	2008-06-24 18:35:34.000000000 +0200
yann@612
    35
+++ glibc-2.7/configure	2008-06-24 18:38:46.000000000 +0200
yann@612
    36
@@ -5062,8 +5062,12 @@
yann@612
    37
 # header directory and add that to the list.  NOTE: Only does the right
yann@612
    38
 # thing on a system that doesn't need fixincludes.  (Not presently a problem.)
yann@612
    39
 if test -n "$sysheaders"; then
yann@612
    40
-  ccheaders=`$CC -print-file-name=include`
yann@612
    41
-  SYSINCLUDES="-nostdinc -isystem $ccheaders \
yann@612
    42
+  SYSINCLUDES=-nostdinc
yann@612
    43
+  for d in include include-fixed; do
yann@612
    44
+    i=`$CC -print-file-name="$d"` && test "x$i" != "x$d" &&
yann@612
    45
+    SYSINCLUDES="$SYSINCLUDES -isystem $i"
yann@612
    46
+  done
yann@612
    47
+  SYSINCLUDES="$SYSINCLUDES \
yann@612
    48
 -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
yann@612
    49
   if test -n "$CXX"; then
yann@612
    50
     cxxversion=`$CXX -dumpversion 2>&5` &&