Browse Source

Make libiconv an option in the menu config

Signed-off-by: Alexey Neyman <stilor@att.net>
dev-linux
Alexey Neyman 5 years ago
parent
commit
a20c29dcef
  1. 11
      config/libc/uClibc.in
  2. 2
      packages/uClibc/package.desc
  3. 7
      scripts/build/libc/uClibc.sh

11
config/libc/uClibc.in

@ -25,6 +25,10 @@ config LIBC_UCLIBC_HAS_SUNRPC
bool
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
def_bool y
depends on UCLIBC_0_9_33_2_or_later
@ -154,12 +158,19 @@ config LIBC_UCLIBC_LNXTHRD
config LIBC_UCLIBC_LOCALES
bool
select LIBC_UCLIBC_WCHAR
# Before it became a separate option, libiconv depended on locales
prompt "Add support for locales"
help
Say y if you want uClibc to support localisation.
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
bool
prompt "Add support for IPv6"

2
packages/uClibc/package.desc

@ -4,5 +4,5 @@ preferred='uClibc-ng'
origin='uclibc.org'
repository='git git://git.busybox.net/uClibc'
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'

7
scripts/build/libc/uClibc.sh

@ -314,6 +314,13 @@ manage_uClibc_config() {
CT_KconfigDisableOption "UCLIBC_HAS_IPV6" "${dst}"
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.
# I'm not sure locales are a requirement for doing C++... Are they?
if [ "${CT_CC_LANG_CXX}" = "y" ]; then

Loading…
Cancel
Save