ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-19 04:47:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove support for pregenerated locales in uClibc

Browse Source 
It fails to compile with the only locale version available (030818)
(on master too, with exactly the same error).

uClibc-ng does not use pregenerated locales.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2017-07-03 17:45:37 -07:00
parent 16a56ed75b
commit 50a387afa7
4 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config/libc/uClibc.in.2
View File

@ -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"

0
packages/uClibc-locale/030818/version.desc
View File

3
packages/uClibc-locale/package.desc
View File

@ -1,3 +0,0 @@
# TBD repository='git git://git.busybox.net/uClibc'
mirrors='http://www.uclibc.org/downloads'
archive_dirname='.'

30
scripts/build/libc/uClibc.sh
View File

@ -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