svn commit: branches/uClibc_0_9_29: extra/locale

[vapier at uclibc.org]

Author: vapier
Date: 2008-01-05 09:51:09 -0800 (Sat, 05 Jan 2008)
New Revision: 20785

Log:
Merge r20395 by carmelo from trunk:
Fix build system to generate locale data instead of using pregenerated ones


Modified:
   branches/uClibc_0_9_29/Makefile.in
   branches/uClibc_0_9_29/extra/locale/Makefile.in


Changeset:
Modified: branches/uClibc_0_9_29/Makefile.in
===================================================================
--- branches/uClibc_0_9_29/Makefile.in	2008-01-05 17:50:23 UTC (rev 20784)
+++ branches/uClibc_0_9_29/Makefile.in	2008-01-05 17:51:09 UTC (rev 20785)
@@ -103,7 +103,7 @@
 		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

Modified: branches/uClibc_0_9_29/extra/locale/Makefile.in
===================================================================
--- branches/uClibc_0_9_29/extra/locale/Makefile.in	2008-01-05 17:50:23 UTC (rev 20784)
+++ branches/uClibc_0_9_29/extra/locale/Makefile.in	2008-01-05 17:51:09 UTC (rev 20785)
@@ -24,6 +24,8 @@
 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_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