diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-12-13 17:27:37 +0100 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-12-13 21:54:28 +0100 |
commit | fff711786a9ea6a038f5753c5d8599e5cede07c6 (patch) | |
tree | 5c6cf11dd6fca5c416506ff214ee4368ea256d83 /toolchain/toolchain-common.in | |
parent | 742f393ffb0d13c33d4f1184fbaf906ae2310470 (diff) |
toolchain: Improve C library option selection
Turn BR2_LARGEFILE, BR2_INET_IPV6, BR2_INET_RPC, BR2_USE_WCHAR,
BR2_ENABLE_LOCALE and BR2_PROGRAM_INVOCATION into hidden options.
Then, for Buildroot toolchains, external toolchains and Crosstool-NG
toolchains, provide visible options that selects the hidden options.
This allows :
* To show a different label and help text in the case of Buildroot
toolchain (do you want to enable feature X ?) and in the case of
external toolchain (is feature X available in your toolchain ?)
* To not show any option when a glibc external toolchain is selected
(since glibc is assumed to support all of largefile, IPv6, RPC,
WCHAR, locale and program invocation) and have them all selected in
that case.
There is some amount of duplication between Buildroot toolchain config
options and Crosstool-NG toolchain config options, because kconfig
doesn't allow to source the same Config.in file twice (even if under
mutually exclusive conditions). This duplication is more readable that
the hack that consists in splitting files in multiple pieces.
However, this commit changes the name of the options visible in the
configuration interface, so existing .config files will have to be
updated accordingly.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'toolchain/toolchain-common.in')
-rw-r--r-- | toolchain/toolchain-common.in | 57 |
1 files changed, 10 insertions, 47 deletions
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index f67c30aa5..ea4746677 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -5,42 +5,23 @@ # so put it here instead source "toolchain/gdb/Config.in" -comment "Common Toolchain Options" - config BR2_LARGEFILE - bool "Enable large file (files > 2 GB) support?" - help - If you are building your own toolchain and you want to - support files larger than 2GB then enable this option. - If you have an external binary toolchain that has been - built with large file support (files > 2GB) then enable - this option. + bool config BR2_INET_IPV6 - bool "Enable IPv6" - help - If you are building your own toolchain and you want to - enable IPV6 support then enable this option. - If you have an external binary toolchain that has been - built with IPV6 support then enable this option. + bool config BR2_INET_RPC - bool "Enable RPC" - help - Enable RPC. RPC support is needed for nfs. - If you are building your own toolchain and you want to - enable RPC support then enable this option. - If you have an external binary toolchain that has been - built with RPC support then enable this option. + bool + +config BR2_USE_WCHAR + bool config BR2_ENABLE_LOCALE - bool "Enable toolchain locale/i18n support?" - select BR2_USE_WCHAR - help - If you are building your own toolchain and you want to - enable locale/i18n support then enable this option. - If you have an external binary toolchain that has been - built with locale/i18n support then enable this option. + bool + +config BR2_PROGRAM_INVOCATION + bool config BR2_ENABLE_LOCALE_PURGE bool "Purge unwanted locales" @@ -78,14 +59,6 @@ config BR2_NEEDS_GETTEXT_IF_LOCALE bool default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE) -config BR2_USE_WCHAR - bool "Enable WCHAR support" - help - If you are building your own toolchain and you want to - enable WCHAR support then enable this option. - If you have an external binary toolchain that has been built - with WCHAR support then enable this option. - config BR2_PREFER_SOFT_FLOAT bool default y if BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel @@ -135,16 +108,6 @@ choice depends on BR2_UCLIBC_VERSION_SNAPSHOT endchoice -config BR2_PROGRAM_INVOCATION - bool "Enable 'program invocation name'" - help - Support for the GNU-specific program_invocation_name and - program_invocation_short_name strings. Some GNU packages - (like tar and coreutils) utilize these for extra useful - output, but in general are not required. - If you have an external binary toolchain that has been built - with program invocation support then enable this option. - config BR2_GCC_CROSS_CXX bool help |