patches/glibc/2.7/180-gcc-4.3-sysinclude-path.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
parent 747 d3e603e7c17c
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
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` &&