diff options
| -rw-r--r-- | extra/Configs/Config.in | 24 | ||||
| -rw-r--r-- | extra/locale/Makefile.in | 22 | ||||
| -rwxr-xr-x | extra/scripts/randconfig.sh | 2 |
3 files changed, 0 insertions, 48 deletions
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index eb2bec935..cdd494216 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1555,17 +1555,6 @@ config UCLIBC_BUILD_MINIMAL_LOCALE If you do not need all locales that are available on your host-box, then set this to 'Y'. -config UCLIBC_PREGENERATED_LOCALE_DATA - bool "Use Pre-generated Locale Data" - depends on UCLIBC_HAS_LOCALE && !TARGET_metag - help - Use pre-built locale data. - - Note that these pregenerated locales are sensitive to your - target architecture (endianess, bitcount). - - Saying N here is highly recommended. - endchoice config UCLIBC_BUILD_MINIMAL_LOCALES @@ -1580,19 +1569,6 @@ config UCLIBC_BUILD_MINIMAL_LOCALES default: en_US -config UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA - bool "Automagically Download the Pre-generated Locale Data (if necessary)" - depends on UCLIBC_PREGENERATED_LOCALE_DATA - help - If you would like the build process to use 'wget' to automatically - download the pregenerated locale data, enable this option. Otherwise - you will need to obtain the locale data yourself from: - http://www.uclibc.org/downloads/uClibc-locale-*.tgz - and place the uClibc-locale-*.tgz tarball in the extra/locale/ - directory. - - Note that the use of pregenerated locale data is discouraged. - config UCLIBC_HAS_XLOCALE bool "Extended Locale Support (experimental/incomplete)" depends on UCLIBC_HAS_LOCALE diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in index efd07ed61..117993fd0 100644 --- a/extra/locale/Makefile.in +++ b/extra/locale/Makefile.in @@ -190,26 +190,6 @@ $(locale_OUT)/locale_collate.h: $(locale_OUT)/gen_collate $(locale_OUT)/locale_t $(SED) -e "s/^.*COL_IDX_\([^, ]*\).*$$/\1/" | sort | uniq | \ xargs $< $(locale_DIR)/collation $(FLAG-locale-verbose) -o $@ -$(locale_OUT)/$(LOCALE_DATA_FILENAME): -ifeq ($(UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA),y) - ( cd $(@D); $(WGET) http://www.uclibc.org/downloads/$(@F) ) -endif - -ifeq ($(UCLIBC_PREGENERATED_LOCALE_DATA),y) - -$(locale_SRC): $(locale_OUT)/$(LOCALE_DATA_FILENAME) - zcat $< | $(TAR) -xv -C $(@D) -f - - touch $@ - # we use the one in locale_DIR - #$(RM) $(locale_OUT)/locale_mmap.h - -# for arch specific versions we have to at least overwrite -# lt_defines.h/locale_data.c/uClibc_locale_data.h - -$(locale_OUT)/uClibc_locale_data.h: $(locale_SRC) - -else - $(locale_SRC): $(locale_OUT)/gen_ldc $(locale_OUT)/lt_defines.h @$(disp_gen) $(Q)$< $@ @@ -219,8 +199,6 @@ $(locale_OUT)/uClibc_locale_data.h: $(locale_OUT)/lt_defines.h $(locale_OUT)/c8t $(Q)grep -v "define __LC" $< > $@ $(Q)cat $(wordlist 2,4,$^) >> $@ -endif - $(top_builddir)include/bits/uClibc_locale_data.h: $(locale_OUT)/uClibc_locale_data.h | $(top_builddir)include/bits/uClibc_config.h @$(disp_gen) $(Q)$(AWK) 'BEGIN{i=1}{if (/WANT_/) i=/endif/;else if (i) print $0}' \ diff --git a/extra/scripts/randconfig.sh b/extra/scripts/randconfig.sh index 4c7126bbc..d83731b6e 100755 --- a/extra/scripts/randconfig.sh +++ b/extra/scripts/randconfig.sh @@ -10,9 +10,7 @@ test "x$AWK" = "x" && AWK=awk test "x$ARCH" = "x" && ARCH=`uname -m` KCONFIG_ALLCONFIG=.config.allconfig (echo TARGET_$ARCH=y - echo '# UCLIBC_PREGENERATED_LOCALE_DATA is not set' echo '# DOMULTI is not set' - echo '# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set' ) > $KCONFIG_ALLCONFIG export KCONFIG_ALLCONFIG |