diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-25 21:04:23 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-26 12:41:05 +0200 |
| commit | 1cf04b9efde27c39a600862f962e0a703e3fc20f (patch) | |
| tree | 9e5c99ba274e7727a3e2cc65c39d26cc2fe45bdc /target | |
| parent | 9162b50f553369444930878e318a929509aa720f (diff) | |
rework intl/iconv/locale configuration for uClibc-ng toolchains
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.runtime | 14 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 47 |
2 files changed, 42 insertions, 19 deletions
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 8ea01c4e9..87f3febbd 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -35,7 +35,8 @@ config ADK_RUNTIME_INIT_SYSTEMD select ADK_PACKAGE_SYSTEMD select ADK_PACKAGE_DBUS select ADK_PACKAGE_DBUS_WITH_SYSTEMD - select ADK_RUNTIME_ENABLE_LOCALE + select ADK_TARGET_LIBC_WITH_LOCALE if ADK_TARGET_LIB_UCLIBC_NG + select ADK_TARGET_LIBC_WITH_LIBINTL_STUB if ADK_TARGET_LIB_UCLIBC_NG select ADK_TARGET_USE_SSP depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_UCLIBC_NG @@ -199,19 +200,12 @@ config ADK_RUNTIME_TIMEZONE help Predefine the timezone for the embedded system. -config ADK_RUNTIME_ENABLE_LOCALE - bool "enable locale (i18n) support" - select ADK_TARGET_LIBC_ICONV if ADK_TARGET_LIB_UCLIBC_NG - select BUSYBOX_LOCALE_SUPPORT - help - Enable locale support for the target. - config ADK_RUNTIME_DEFAULT_LOCALE string "default locale" - depends on ADK_RUNTIME_ENABLE_LOCALE + depends on ADK_TARGET_LIBC_WITH_LOCALE default "de_DE" help - Set locale to be set in the target system as default. + Locale to be set in the target system as default. choice prompt "bootup messages from kernel" 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 |