diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-02-10 23:04:35 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-02-10 23:04:35 (GMT) |
| commit | 9e8a2b295d770a417e50f733b15e428dede3aea6 (patch) | |
| tree | 7686fc3eebf14b3a65348b0644f198964face481 | |
| parent | a3e1adbe71d6c8478dd4cd00eaea8fa594bdd9b1 (diff) | |
| parent | a20c29dcefe8c3319ae7163935a2d89ac2e1de32 (diff) | |
Merge pull request #910 from stilor/uclibc-no-rpc
uClibc-ng: configurability enhancements
| -rw-r--r-- | config/libc/uClibc.in | 16 | ||||
| -rw-r--r-- | packages/uClibc/package.desc | 2 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 7 |
3 files changed, 24 insertions, 1 deletions
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index 174dfdc..7bdd03f 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -21,6 +21,14 @@ comment "'softfp' ABI and uClibc is not entirely tested in crosstool-NG" comment "You may experience issues, although it should work just fine" endif # ARCH_FLOAT_SOFTFP +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 @@ -150,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" @@ -188,6 +203,7 @@ config LIBC_UCLIBC_FENV config LIBC_UCLIBC_RPC bool prompt "Add support for RPC" + depends on LIBC_UCLIBC_HAS_SUNRPC help Enable support for remote procedure calls (RPC) in uClibc. diff --git a/packages/uClibc/package.desc b/packages/uClibc/package.desc index d7f15df..7035b96 100644 --- a/packages/uClibc/package.desc +++ b/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' +milestones='0.9.33.2 1.0.0 1.0.15 1.0.21 1.0.23' archive_formats='.tar.xz .tar.bz2' diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index 599283e..eb6cf5b 100644 --- a/scripts/build/libc/uClibc.sh +++ b/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 |