aboutsummaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-12-23 09:39:05 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-12-23 09:39:05 +0000
commit11050fcc62b4d4a9ee418ff6d13686f3709f96f2 (patch)
treeecf44bd6c2c3401515e99d609a364da167d873d1 /toolchain
parent5c4674da5697406c0a1222a03107258bbcdc432d (diff)
downloadbuildroot-11050fcc62b4d4a9ee418ff6d13686f3709f96f2.tar.gz
buildroot-11050fcc62b4d4a9ee418ff6d13686f3709f96f2.tar.bz2
toolchain/uclibc: Add BR2_ENABLE_LOCALE_PREGENERATED option
Add an option to either generate locales yourself or download the pregenerated set. Based on 4bdca9cc in Bernhard's tree.
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/Config.in12
-rw-r--r--toolchain/uClibc/uclibc.mk10
2 files changed, 17 insertions, 5 deletions
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 3c809c1081..fac4dfa0d9 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -56,7 +56,17 @@ config BR2_UCLIBC_CONFIG
config BR2_ENABLE_LOCALE
bool "Enable locale/gettext/i18n support?"
help
- Enable locale/gettext/i18n support?
+ Enable locale/gettext/i18n support?
+
+config BR2_ENABLE_LOCALE_PREGENERATED
+ bool "Use pregenerated locale data?"
+ depends on BR2_ENABLE_LOCALE
+ help
+ Instead of generating the locale data locally you can optionally
+ download a pregenerated set of locales.
+
+ Say N here unless your buildhost lacks locale support and you
+ desparately want to use internationalization on your target.
choice
prompt "Thread library implementation"
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index bd54aa0ab3..14c4a22550 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -96,7 +96,7 @@ UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(strip $(subst ",, $(BR2_SPARC_TYPE)))
$(DL_DIR)/$(UCLIBC_SOURCE):
$(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
-ifneq ($(BR2_ENABLE_LOCALE),)
+ifneq ($(BR2_ENABLE_LOCALE_PREGENERATED),)
UCLIBC_SITE_LOCALE:=http://www.uclibc.org/downloads
UCLIBC_SOURCE_LOCALE:=uClibc-locale-030818.tgz
@@ -125,7 +125,7 @@ else
toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
uClibc.\*.patch uClibc.\*.patch.$(ARCH)
endif
-ifneq ($(BR2_ENABLE_LOCALE),)
+ifneq ($(BR2_ENABLE_LOCALE_PREGENERATED)),)
cp -dpf $(DL_DIR)/$(UCLIBC_SOURCE_LOCALE) $(UCLIBC_DIR)/extra/locale/
endif
touch $@
@@ -346,11 +346,13 @@ else
echo "# PTHREADS_DEBUG_SUPPORT is not set" >> $(UCLIBC_DIR)/.oldconfig
endif
ifeq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_ENABLE_LOCALE_PREGENERATED),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=y\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
+endif
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