ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-21 05:43:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make libiconv an option in the menu config

Browse Source 
Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2018-02-10 14:35:50 -08:00
parent 89fdeb9af2
commit a20c29dcef
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/libc/uClibc.in
View File

@ -25,6 +25,10 @@ config LIBC_UCLIBC_HAS_SUNRPC
bool bool
default y if !UCLIBC_1_0_23_or_later default y if !UCLIBC_1_0_23_or_later
config LIBC_UCLIBC_HAS_LIBICONV
bool
default y if UCLIBC_1_0_21_or_later
config LIBC_UCLIBC_PARALLEL config LIBC_UCLIBC_PARALLEL
def_bool y def_bool y
depends on UCLIBC_0_9_33_2_or_later depends on UCLIBC_0_9_33_2_or_later
@ -154,12 +158,19 @@ config LIBC_UCLIBC_LNXTHRD
config LIBC_UCLIBC_LOCALES config LIBC_UCLIBC_LOCALES
bool bool
select LIBC_UCLIBC_WCHAR select LIBC_UCLIBC_WCHAR
# Before it became a separate option, libiconv depended on locales
prompt "Add support for locales" prompt "Add support for locales"
help help
Say y if you want uClibc to support localisation. Say y if you want uClibc to support localisation.
Note that seems to be broken on recent uClibc releases. Note that seems to be broken on recent uClibc releases.
config LIBC_UCLIBC_LIBICONV
bool "Enable iconv"
depends on LIBC_UCLIBC_HAS_LIBICONV
help
Say y if you want to enable <iconv.h> and the corresponding interfaces.
config LIBC_UCLIBC_IPV6 config LIBC_UCLIBC_IPV6
bool bool
prompt "Add support for IPv6" prompt "Add support for IPv6"

2
packages/uClibc/package.desc
View File

@ -4,5 +4,5 @@ preferred='uClibc-ng'
origin='uclibc.org' origin='uclibc.org'
repository='git git://git.busybox.net/uClibc' repository='git git://git.busybox.net/uClibc'
mirrors='http://www.uclibc.org/downloads http://www.uclibc.org/downloads/old-releases' mirrors='http://www.uclibc.org/downloads http://www.uclibc.org/downloads/old-releases'
milestones='0.9.33.2 1.0.0 1.0.15 1.0.23' milestones='0.9.33.2 1.0.0 1.0.15 1.0.21 1.0.23'
archive_formats='.tar.xz .tar.bz2' archive_formats='.tar.xz .tar.bz2'

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

@ -314,6 +314,13 @@ manage_uClibc_config() {
CT_KconfigDisableOption "UCLIBC_HAS_IPV6" "${dst}" CT_KconfigDisableOption "UCLIBC_HAS_IPV6" "${dst}"
fi fi
# Iconv support
if [ "${CT_LIBC_UCLIBC_LIBICONV}" = "y" ]; then
CT_KconfigEnableOption "UCLIBC_HAS_LIBICONV" "${dst}"
else
CT_KconfigDisableOption "UCLIBC_HAS_LIBICONV" "${dst}"
fi
# Force on options needed for C++ if we'll be making a C++ compiler. # Force on options needed for C++ if we'll be making a C++ compiler.
# I'm not sure locales are a requirement for doing C++... Are they? # I'm not sure locales are a requirement for doing C++... Are they?
if [ "${CT_CC_LANG_CXX}" = "y" ]; then if [ "${CT_CC_LANG_CXX}" = "y" ]; then