patches/gcc/3.4.6/170-sdk-libstdc++-includes.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 339 bd5e0a849352
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 diff -durN gcc-3.4.6.orig/libstdc++-v3/fragment.am gcc-3.4.6/libstdc++-v3/fragment.am
     2 --- gcc-3.4.6.orig/libstdc++-v3/fragment.am	2003-08-27 02:38:28.000000000 +0200
     3 +++ gcc-3.4.6/libstdc++-v3/fragment.am	2007-08-15 22:59:09.000000000 +0200
     4 @@ -18,7 +18,7 @@
     5  	$(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
     6  
     7  # -I/-D flags to pass when compiling.
     8 -AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
     9 +AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -I$(toplevel_srcdir)/include
    10  
    11  
    12  
    13 diff -durN gcc-3.4.6.orig/libstdc++-v3/libmath/Makefile.am gcc-3.4.6/libstdc++-v3/libmath/Makefile.am
    14 --- gcc-3.4.6.orig/libstdc++-v3/libmath/Makefile.am	2003-08-27 23:29:43.000000000 +0200
    15 +++ gcc-3.4.6/libstdc++-v3/libmath/Makefile.am	2007-08-15 22:59:09.000000000 +0200
    16 @@ -32,7 +32,7 @@
    17  
    18  libmath_la_SOURCES = stubs.c
    19  
    20 -AM_CPPFLAGS = $(CANADIAN_INCLUDES)
    21 +AM_CPPFLAGS = $(CANADIAN_INCLUDES) -I$(toplevel_srcdir)/include
    22  
    23  # Only compiling "C" sources in this directory.
    24  LIBTOOL = @LIBTOOL@ --tag CC