patches/uClibc/0.9.32/150-Rules.mak-Rearrange-appending-UCLIBC_EXTRA_CFLAGS-to-CFLAGS.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)
     1 commit 4642f4eead07080bf46b6d67b873d303eda9fb48
     2 Author: Khem Raj <raj.khem@gmail.com>
     3 Date:   Sat Jun 11 00:15:02 2011 -0700
     4 
     5     Rules.mak: Rearrange appending UCLIBC_EXTRA_CFLAGS to CFLAGS
     6     
     7     UCLIBC_EXTRA_CFLAGS is currently added before the OPTIMIZATION flags
     8     and OPTIMIZATION is chosen to be Os by default. But in OE we pass the optimisation
     9     flags through UCLIBC_EXTRA_CFLAGS but they are not effective since -Os is
    10     specified at last. So we need to change the order of these option flags
    11     
    12     Signed-off-by: Khem Raj <raj.khem@gmail.com>
    13     Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
    14 
    15 diff --git a/Rules.mak b/Rules.mak
    16 index a00deea..6b8f5b2 100644
    17 --- a/Rules.mak
    18 +++ b/Rules.mak
    19 @@ -585,9 +585,6 @@ CFLAGS := -include $(top_srcdir)include/libc-symbols.h \
    20  	-nostdinc -I$(top_builddir)include -I$(top_srcdir)include -I. \
    21  	-I$(top_srcdir)libc/sysdeps/linux \
    22  	-I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)
    23 -ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"")
    24 -CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS))
    25 -endif
    26  
    27  # We need this to be checked within libc-symbols.h
    28  ifneq ($(HAVE_SHARED),y)
    29 @@ -633,6 +630,9 @@ LDFLAGS += -Wl,-s
    30  else
    31  STRIPTOOL := true -Stripping_disabled
    32  endif
    33 +ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"")
    34 +CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS))
    35 +endif
    36  
    37  ifeq ($(DOMULTI),y)
    38  # we try to compile all sources at once into an object (IMA), but