patches/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
yann@2437
     1
Respect environment CPPFLAGS when we run ./configure so we can inject
yann@2437
     2
random -D things without having to set CFLAGS/ASFLAGS
yann@2437
     3
yann@2437
     4
diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
yann@2437
     5
--- glibc-2.12.1.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
yann@2437
     6
+++ glibc-2.12.1/Makeconfig	2009-11-13 00:49:41.000000000 +0100
yann@2437
     7
@@ -697,6 +697,7 @@
yann@2437
     8
 	   $(foreach lib,$(libof-$(basename $(@F))) \
yann@2437
     9
 		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
yann@2437
    10
 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
yann@2437
    11
+CPPFLAGS += $(CPPFLAGS-config)
yann@2437
    12
 override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
yann@2437
    13
 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
yann@2437
    14
 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
yann@2437
    15
diff -durN glibc-2.12.1.orig/config.make.in glibc-2.12.1/config.make.in
yann@2437
    16
--- glibc-2.12.1.orig/config.make.in	2009-05-09 17:59:38.000000000 +0200
yann@2437
    17
+++ glibc-2.12.1/config.make.in	2009-11-13 00:49:41.000000000 +0100
yann@2437
    18
@@ -107,6 +107,7 @@
yann@2437
    19
 CXX = @CXX@
yann@2437
    20
 BUILD_CC = @BUILD_CC@
yann@2437
    21
 CFLAGS = @CFLAGS@
yann@2437
    22
+CPPFLAGS-config = @CPPFLAGS@
yann@2437
    23
 ASFLAGS-config = @ASFLAGS_config@
yann@2437
    24
 AR = @AR@
yann@2437
    25
 RANLIB = @RANLIB@