diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Config.in.2 | 17 | ||||
| -rw-r--r-- | toolchain/uClibc/uClibc-0.9.31.config | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2 index fc6759dd6..595ab8719 100644 --- a/toolchain/Config.in.2 +++ b/toolchain/Config.in.2 @@ -56,13 +56,20 @@ config BR2_ENABLE_LOCALE_WHITELIST will be available on the target - That purely depends on the support for that locale in the selected packages. -# uClibc toolchains require a separatly-compiled gettext/libintl when -# locale support is enabled. This isn't necessary with glibc -# toolchains as glibc includes gettext/libintl. +# glibc and eglibc directly include gettext, so a separatly compiled +# gettext isn't needed and shouldn't be built to avoid conflicts. Some +# packages always need gettext, other packages only need gettext when +# locale support is enabled. See the documentation for how packages +# should rely on the following two options. + config BR2_NEEDS_GETTEXT bool - default y if (BR2_TOOLCHAIN_BUILDROOT && BR2_ENABLE_LOCALE) - default y if (BR2_TOOLCHAIN_EXTERNAL_UCLIBC && BR2_ENABLE_LOCALE) + default y if BR2_TOOLCHAIN_BUILDROOT + default y if BR2_TOOLCHAIN_EXTERNAL_UCLIBC + +config BR2_NEEDS_GETTEXT_IF_LOCALE + bool + default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE) config BR2_USE_WCHAR bool "Enable WCHAR support" diff --git a/toolchain/uClibc/uClibc-0.9.31.config b/toolchain/uClibc/uClibc-0.9.31.config index 57541b93f..87f241111 100644 --- a/toolchain/uClibc/uClibc-0.9.31.config +++ b/toolchain/uClibc/uClibc-0.9.31.config @@ -62,7 +62,7 @@ DOPIC=y # ARCH_HAS_NO_SHARED is not set # ARCH_HAS_NO_LDSO is not set HAVE_SHARED=y -FORCE_SHAREABLE_TEXT_SEGMENTS=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y # LDSO_CACHE_SUPPORT is not set # LDSO_PRELOAD_FILE_SUPPORT is not set |