Author: nbd
Date: 2014-11-30 23:22:14 +0100 (Sun, 30 Nov 2014)
New Revision: 43445
Modified:
trunk/toolchain/uClibc/common.mk
trunk/toolchain/uClibc/config-0.9.33.2/common
Log:
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 <[email protected]>
Modified: trunk/toolchain/uClibc/common.mk
===================================================================
--- trunk/toolchain/uClibc/common.mk 2014-11-30 22:12:20 UTC (rev 43444)
+++ trunk/toolchain/uClibc/common.mk 2014-11-30 22:22:14 UTC (rev 43445)
@@ -79,6 +79,7 @@
-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 && \
Modified: trunk/toolchain/uClibc/config-0.9.33.2/common
===================================================================
--- trunk/toolchain/uClibc/config-0.9.33.2/common 2014-11-30 22:12:20 UTC
(rev 43444)
+++ trunk/toolchain/uClibc/config-0.9.33.2/common 2014-11-30 22:22:14 UTC
(rev 43445)
@@ -132,6 +132,9 @@
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
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
