From 1cf04b9efde27c39a600862f962e0a703e3fc20f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 25 Jun 2017 21:04:23 +0200
Subject: rework intl/iconv/locale configuration for uClibc-ng toolchains

---
 target/config/Config.in.toolchain | 47 +++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 9 deletions(-)

(limited to 'target/config/Config.in.toolchain')

diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 92bfd79d5..b9082cb86 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -24,18 +24,47 @@ config ADK_TARGET_USE_SHARED_AND_STATIC_LIBS
 endchoice
 
 choice
-depends on ADK_TARGET_OS_LINUX
-bool "Iconv implementation"
+depends on ADK_TARGET_LIB_UCLIBC_NG
+bool "Locale support"
+
+config ADK_TARGET_LIBC_WITHOUT_LOCALE
+	bool "Disable locale support"
+
+config ADK_TARGET_LIBC_WITH_LOCALE
+	bool "Enable locale support"
+	select BUSYBOX_LOCALE_SUPPORT if ADK_PACKAGE_BUSYBOX
+
+endchoice
+
+choice
+depends on ADK_TARGET_LIB_UCLIBC_NG
+bool "Intl support"
+
+config ADK_TARGET_LIBC_WITHOUT_LIBINTL
+	bool "Disable libintl support"
+	help
+	  Disables uClibc-ng internal stub support.
+
+config ADK_TARGET_LIBC_WITH_LIBINTL
+	bool "Enable libintl stub support"
+	help
+	  Enables uClibc-ng libintl stub.
+
+endchoice
 
-config ADK_TARGET_LIBC_ICONV
-	bool "Use iconv from C library"
+choice
+depends on ADK_TARGET_LIB_UCLIBC_NG
+bool "Iconv support"
 
-config ADK_TARGET_LIBICONV
-	bool "Use libiconv package"
-	select ADK_PACKAGE_LIBICONV
+config ADK_TARGET_LIBC_WITHOUT_LIBICONV
+	bool "Disable libiconv support"
+	help
+	  Disables uClibc-ng internal libiconv support.
 
-config ADK_TARGET_WITHOUT_ICONV
-	bool "Do not build any iconv code"
+config ADK_TARGET_LIBC_WITH_LIBICONV
+	bool "Enable basic libiconv"
+	help
+	  Enables uClibc-ng included basic libiconv support.
 
 endchoice
 
-- 
cgit v1.2.3