uclibc: BR2_ENABLE_LOCALE selects BR2_USE_WCHAR

PATCH New Markus Heidelberg 1 participant 1 message Oct 25, 2008

Share & tools

Markus Heidelberg

author

2008-10-25 00:27 UTC #0 lore raw

PATCH 1/1 uclibc: BR2_ENABLE_LOCALE selects BR2_USE_WCHAR

This also fixes the problem, when BR2_ENABLE_LOCALE=y and BR2_USE_WCHAR=n. Then UCLIBC_HAS_WCHAR was first set to y but after it overwritten to n.
---
Is this the right thing to do? It seemed so to me, because BR2_ENABLE_LOCALE definitely wants to activate WCHAR support in uclibc.mk.

 toolchain/uClibc/Config.in |    1 +
 toolchain/uClibc/uclibc.mk |    2 --
 2 files changed, 1 insertions(+), 2 deletions(-)

toolchain/uClibc/Config.in +1 -0

index 4af60ea..f55379a 100644
@@ -45,6 +45,7 @@ config BR2_UCLIBC_CONFIG
 
 config BR2_ENABLE_LOCALE
 	bool "Enable locale/gettext/i18n support?"
+	select BR2_USE_WCHAR
 	help
 	    Enable locale/gettext/i18n support?

toolchain/uClibc/uclibc.mk +0 -2

index 45b57ce..02ceb3d 100644
@@ -344,10 +344,8 @@ else
 endif
 ifeq ($(BR2_ENABLE_LOCALE),y)
 	$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_PREGENERATED_LOCALE_DATA=y\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
-	$(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.oldconfig
 else
 	$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.oldconfig
-	$(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=n,g' $(UCLIBC_DIR)/.oldconfig
 endif
 ifeq ($(BR2_USE_WCHAR),y)
 	$(SED) 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.oldconfig

Signature · 1 line

1.5.6.4