aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-11-30 22:22:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-11-30 22:22:14 +0000
commit3f130f7a457dfd728786329d8dc49961a38b3913 (patch)
tree0abcfdd6104bef9b28ffefab4fdbcc6403ae53a9
parentc69143089745f5d448afc7d9008d3e29c4c12295 (diff)
downloadupstream-3f130f7a457dfd728786329d8dc49961a38b3913.tar.gz
upstream-3f130f7a457dfd728786329d8dc49961a38b3913.tar.bz2
upstream-3f130f7a457dfd728786329d8dc49961a38b3913.zip
toolchain: uClibc: fix build with CONFIG_BUILD_NLS selected
Without this patch, selecting "Compile with full language support" results in the following question during build: ... Locale Support (UCLIBC_HAS_LOCALE) [Y/n/?] y Locale data > 1. All locales (UCLIBC_BUILD_ALL_LOCALE) (NEW) 2. Only selected locales (UCLIBC_BUILD_MINIMAL_LOCALE) (NEW) 3. Use Pre-generated Locale Data (UCLIBC_PREGENERATED_LOCALE_DATA) (NEW) choice[1-3]: Signed-off-by: Michael Heimpold <mhei@heimpold.de> SVN-Revision: 43445
-rw-r--r--toolchain/uClibc/common.mk1
-rw-r--r--toolchain/uClibc/config-0.9.33.2/common3
2 files changed, 4 insertions, 0 deletions
diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk
index 69ac470b02..e507dc6fb0 100644
--- a/toolchain/uClibc/common.mk
+++ b/toolchain/uClibc/common.mk
@@ -79,6 +79,7 @@ define Host/Configure
-e 's,^.*UCLIBC_HAS_SOFT_FLOAT.*,UCLIBC_HAS_SOFT_FLOAT=$(if $(CONFIG_SOFT_FLOAT),y,n),g' \
-e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
-e 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
+ -e 's,^.*UCLIBC_BUILD_ALL_LOCALE.*,UCLIBC_BUILD_ALL_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
$(HOST_BUILD_DIR)/.config.new
cmp -s $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last || { \
cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config && \
diff --git a/toolchain/uClibc/config-0.9.33.2/common b/toolchain/uClibc/config-0.9.33.2/common
index fce922edf3..c587b9a9fc 100644
--- a/toolchain/uClibc/config-0.9.33.2/common
+++ b/toolchain/uClibc/config-0.9.33.2/common
@@ -132,6 +132,9 @@ UCLIBC_HAS_LIBNSL_STUB=y
UCLIBC_HAS_LIBRESOLV_STUB=y
UCLIBC_HAS_LIBUTIL=y
# UCLIBC_HAS_LOCALE is not set
+# UCLIBC_BUILD_ALL_LOCALE is not set
+# UCLIBC_BUILD_MINIMAL_LOCALE is not set
+# UCLIBC_PREGENERATED_LOCALE_DATA is not set
UCLIBC_HAS_LONG_DOUBLE_MATH=y
UCLIBC_HAS_NETWORK_SUPPORT=y
UCLIBC_HAS_NFTW=y