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