diff options
| -rw-r--r-- | config/libc/uClibc.in.2 | 17 | ||||
| -rw-r--r-- | packages/uClibc-locale/030818/version.desc | 0 | ||||
| -rw-r--r-- | packages/uClibc-locale/package.desc | 3 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 30 |
4 files changed, 4 insertions, 46 deletions
diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2 index 0883959..2ff0d15 100644 --- a/config/libc/uClibc.in.2 +++ b/config/libc/uClibc.in.2 @@ -47,23 +47,6 @@ config LIBC_UCLIBC_LOCALES Note that seems to be broken on recent uClibc releases. -config LIBC_UCLIBC_LOCALES_PREGEN_DATA - bool - prompt "Use pregen locales" - depends on LIBC_UCLIBC_LOCALES - depends on ! LIBC_UCLIBC_NG - default y - help - If you see issues with using pre-generated locales data, - you can try switching this off. - - If so, please report the issue, so we can default this - to off if too many people complain. - -if LIBC_UCLIBC_LOCALES_PREGEN_DATA -source "config/versions/uClibc-locale.in" -endif - config LIBC_UCLIBC_IPV6 bool prompt "Add support for IPv6" diff --git a/packages/uClibc-locale/030818/version.desc b/packages/uClibc-locale/030818/version.desc deleted file mode 100644 index e69de29..0000000 --- a/packages/uClibc-locale/030818/version.desc +++ /dev/null diff --git a/packages/uClibc-locale/package.desc b/packages/uClibc-locale/package.desc deleted file mode 100644 index a14de38..0000000 --- a/packages/uClibc-locale/package.desc +++ /dev/null @@ -1,3 +0,0 @@ -# TBD repository='git git://git.busybox.net/uClibc' -mirrors='http://www.uclibc.org/downloads' -archive_dirname='.' diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index fdaded8..af07888 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -5,17 +5,11 @@ # Download uClibc do_libc_get() { CT_Fetch UCLIBC - if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" ]; then - CT_Fetch UCLIBC_LOCALE - fi } # Extract uClibc do_libc_extract() { CT_ExtractPatch UCLIBC - if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" ]; then - CT_ExtractPatch UCLIBC_LOCALE - fi } # Build and install headers and start files @@ -99,14 +93,6 @@ do_libc_backend_once() { # Simply copy files until uClibc has the ability to build out-of-tree CT_DoLog EXTRA "Copying sources to build dir" CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc/." . - if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" ]; then - # uClibc's makefile insists on unpacking, but that would screw fetching from - # non-tarball locations. - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-locale/." extra/locale - CT_DoExecLog ALL touch extra/locale/dummy-file - CT_DoExecLog ALL tar czf extra/locale/dummy.tar.gz -C extra/locale dummy-file - make_args+=( LOCALE_DATA_FILENAME=dummy.tar.gz ) - fi # Force the date of the pregen locale data, as the # newer ones that are referenced are not available @@ -305,22 +291,14 @@ manage_uClibc_config() { # assume the user has already made all the appropriate generation # arrangements. Note that having the uClibc Makefile download the # pregenerated locales is not compatible with crosstool. - case "${CT_LIBC_UCLIBC_LOCALES}:${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" in - :*) - ;; - y:) + if [ -z "${CT_LIBC_UCLIBC_LOCALES}" ]; then + CT_KconfigDisableOption "UCLIBC_HAS_LOCALE" "${dst}" + else CT_KconfigEnableOption "UCLIBC_HAS_LOCALE" "${dst}" CT_KconfigDeleteOption "UCLIBC_PREGENERATED_LOCALE_DATA" "${dst}" CT_KconfigDeleteOption "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA" "${dst}" CT_KconfigDeleteOption "UCLIBC_HAS_XLOCALE" "${dst}" - ;; - y:y) - CT_KconfigEnableOption "UCLIBC_HAS_LOCALE" "${dst}" - CT_KconfigEnableOption "UCLIBC_PREGENERATED_LOCALE_DATA" "${dst}" - CT_KconfigDeleteOption "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA" "${dst}" - CT_KconfigDeleteOption "UCLIBC_HAS_XLOCALE" "${dst}" - ;; - esac + fi # WCHAR support if [ "${CT_LIBC_UCLIBC_WCHAR}" = "y" ]; then |