summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2007-11-09 13:04:26 +0000
committerCarmelo Amoroso <carmelo.amoroso@st.com>2007-11-09 13:04:26 +0000
commit693245823c91dbfd9fa84c6b16636d963edf7cf3 (patch)
treec40da46691bdfec20728cba3f4171a1521adf65c
parentb4db2019624a08a530e6d0f4376fad3705bf4b05 (diff)
Fix build system to generate locale data instead of using pregenerated ones
-rw-r--r--Makefile.in2
-rw-r--r--extra/locale/Makefile.in4
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 170005e77..c0ca23d42 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -103,7 +103,7 @@ headers: include/bits/uClibc_config.h
mv -f $$tmp include/bits/sysnum.h; \
fi
ifeq ($(UCLIBC_HAS_LOCALE),y)
- $(MAKE) locale_headers
+ $(MAKE) -C extra/locale locale_headers
endif
pregen: headers
diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in
index 1f203d424..ec27bedb8 100644
--- a/extra/locale/Makefile.in
+++ b/extra/locale/Makefile.in
@@ -24,6 +24,8 @@ BUILD_CFLAGS-gen_wc8bit += -DDO_WIDE_CHAR=1
BUILD_CFLAGS-gen_ldc += -D__WCHAR_ENABLED=1
endif
+BUILD_CFLAGS-gen_locale := -D_GNU_SOURCE
+
DEPH-locale := $(top_builddir)include/bits/sysnum.h
DEPH-gen_locale := c8tables.h
DEPH-gen_ldc := c8tables.h wctables.h locale_tables.h locale_collate.h
@@ -161,7 +163,7 @@ $(locale_SRC): $(locale_OUT)/gen_ldc
$(locale_OUT)/uClibc_locale_data.h: $(locale_OUT)/lt_defines.h $(locale_OUT)/c8tables.h $(locale_OUT)/wctables.h $(locale_DIR)/locale_mmap.h | $(locale_SRC)
grep -v "define __LC" $< > $@
- cat $(wordlist 2,3,4,$^) >> $@
+ cat $(wordlist 2,4,$^) >> $@
endif