crosstool-ng: patches/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch@424fa2092ace

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 Respect environment CPPFLAGS when we run ./configure so we can inject

     2 random -D things without having to set CFLAGS/ASFLAGS

     4 diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig

     5 --- glibc-2.12.1.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200

     6 +++ glibc-2.12.1/Makeconfig	2009-11-13 00:49:41.000000000 +0100

     7 @@ -697,6 +697,7 @@

     8  	   $(foreach lib,$(libof-$(basename $(@F))) \

     9  		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \

    10  	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))

    11 +CPPFLAGS += $(CPPFLAGS-config)

    12  override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \

    13  		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \

    14  		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \

    15 diff -durN glibc-2.12.1.orig/config.make.in glibc-2.12.1/config.make.in

    16 --- glibc-2.12.1.orig/config.make.in	2009-05-09 17:59:38.000000000 +0200

    17 +++ glibc-2.12.1/config.make.in	2009-11-13 00:49:41.000000000 +0100

    18 @@ -107,6 +107,7 @@

    19  CXX = @CXX@

    20  BUILD_CC = @BUILD_CC@

    21  CFLAGS = @CFLAGS@

    22 +CPPFLAGS-config = @CPPFLAGS@

    23  ASFLAGS-config = @ASFLAGS_config@

    24  AR = @AR@

    25  RANLIB = @RANLIB@

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--