Fix build system to generate locale data instead of using pregenerated ones

diff --git a/Makefile.in b/Makefile.in
index 170005e778d3d4399159afe22f59ae1095bad6ab..c0ca23d42e222ba4c83512ddf1079d895f32d66a 100644 (file)
--- 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 1f203d4242e9c44dabf1351f0d9d48b41a220cd9..ec27bedb858714c0843fccd4bc04ad3b0df20565 100644 (file)
--- 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