Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.6/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
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> 
     1 Patch pointed to by Ryan ARNOLD on the libc-help ML.

     2 See: http://sourceware.org/ml/libc-help/2008-06/msg00063.html

     3 

     4 Forwarded to crosstool-NG by Ioannis E. VENETIS:

     5 See: http://sourceware.org/ml/libc-help/2008-06/msg00063.html

     6 

     7 GCC 4.3 changed the location of some of the header files.  I don't

     8 understand why you'd be getting these errors while building GCC since

     9 it provides them.

    10 

    11 With regard to GLIBC, Roland checked in some changes so that the GLIBC

    12 build system could find the new locations of the GCC provided header

    13 files.

    14 

    15 diff -durN glibc-2.6.orig/configure.in glibc-2.6/configure.in

    16 --- glibc-2.6.orig/configure.in	2007-06-08 05:16:36.000000000 +0200

    17 +++ glibc-2.6/configure.in	2008-06-24 18:38:46.000000000 +0200

    18 @@ -911,8 +911,12 @@

    19  # header directory and add that to the list.  NOTE: Only does the right

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

    21  if test -n "$sysheaders"; then

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

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

    24 +  SYSINCLUDES=-nostdinc

    25 +  for d in include include-fixed; do

    26 +    i=`$CC -print-file-name="$d"` && test "x$i" != x && test "x$i" != "x$d" &&

    27 +    SYSINCLUDES="$SYSINCLUDES -isystem $i"

    28 +  done

    29 +  SYSINCLUDES="$SYSINCLUDES \

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

    31    if test -n "$CXX"; then

    32      cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&

    33 diff -durN glibc-2.6.orig/configure glibc-2.6/configure

    34 --- glibc-2.6.orig/configure	2008-06-24 18:35:34.000000000 +0200

    35 +++ glibc-2.6/configure	2008-06-24 18:38:46.000000000 +0200

    36 @@ -4562,8 +4562,12 @@

    37  # header directory and add that to the list.  NOTE: Only does the right

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

    39  if test -n "$sysheaders"; then

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

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

    42 +  SYSINCLUDES=-nostdinc

    43 +  for d in include include-fixed; do

    44 +    i=`$CC -print-file-name="$d"` && test "x$i" != "x$d" &&

    45 +    SYSINCLUDES="$SYSINCLUDES -isystem $i"

    46 +  done

    47 +  SYSINCLUDES="$SYSINCLUDES \

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

    49    if test -n "$CXX"; then

    50      cxxversion=`$CXX -dumpversion 2>&5` &&
crosstool-ng