From: nbd Date: Sun, 30 Nov 2014 22:22:14 +0000 (+0000) Subject: toolchain: uClibc: fix build with CONFIG_BUILD_NLS selected X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=37cb753d28769f1328b88ad4c52dece2d4eecd6f;p=openwrt-working-2016%2F.git 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43445 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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