diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-07-06 09:32:22 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2010-07-08 17:23:56 -0700 |
commit | 7bb8608aef75cb519b8c692bfb2703b4a1cd5da3 (patch) | |
tree | 21f51fb05013f5696719200476309b934009eeab /conf | |
parent | 6bbbb1891cdd72ba1d88b9eab43ca2f05f87ebf4 (diff) |
uClibc: redo configuration
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/include/sane-toolchain-uclibc.inc | 7 | ||||
-rw-r--r-- | conf/distro/include/sane-toolchain.inc | 3 | ||||
-rw-r--r-- | conf/distro/include/uclibc.inc | 8 |
3 files changed, 16 insertions, 2 deletions
diff --git a/conf/distro/include/sane-toolchain-uclibc.inc b/conf/distro/include/sane-toolchain-uclibc.inc index 314340ad79..9f515a074f 100644 --- a/conf/distro/include/sane-toolchain-uclibc.inc +++ b/conf/distro/include/sane-toolchain-uclibc.inc @@ -14,6 +14,13 @@ USE_NLS ?= "no" USE_NLS_glib-2.0-native = "yes" USE_NLS_gcc-cross = "no" +PREFERRED_VERSION_uclibc ?= "${PREFERRED_UCLIBC_VERSION}" +PREFERRED_VERSION_uclibc-initial ?= "${PREFERRED_UCLIBC_VERSION}" +PREFERRED_VERSION_uclibc-cross ?= "${PREFERRED_UCLIBC_VERSION}" +PREFERRED_VERSION_uclibc-cross-sdk ?= "${PREFERRED_UCLIBC_VERSION}" +PREFERRED_VERSION_uclibc-cross-initial ?= "${PREFERRED_UCLIBC_VERSION}" +PREFERRED_VERSION_uclibc-cross-intermediate ?= "${PREFERRED_UCLIBC_VERSION}" + #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 00ba0f9f2d..78aff6922b 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -13,8 +13,7 @@ PREFERRED_VERSION_glibc ?= "2.10.1" PREFERRED_VERSION_glibc-initial ?= "2.10.1" PREFERRED_VERSION_eglibc ?= "2.11" PREFERRED_VERSION_eglibc-initial ?= "2.11" -PREFERRED_VERSION_uclibc ?= "0.9.30.1" -PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1" +PREFERRED_UCLIBC_VERSION ?= "0.9.30.1" # Some systems need a special gcc version PREFERRED_GCC_VERSION_486sx ?= "4.3.2" diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc index ee18fc87e1..b40fbf5ff6 100644 --- a/conf/distro/include/uclibc.inc +++ b/conf/distro/include/uclibc.inc @@ -9,3 +9,11 @@ PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl" PREFERRED_PROVIDER_virtual/libc = "uclibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "uclibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" + +# libc settings +DISTRO_FEATURES += "${@['', ' nls'][bb.data.getVar('ENABLE_BINARY_LOCALE_GENERATION', d, 1) == '1']}" +MACHINE_FEATURES += "${@['', ' bx'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" +# FIXME: We enable IPv4 per default to avoid alot of breakage. +# FIXME: Figure out an acceptable way to negotiate either +# FIXME: desired features or hard requirements, either top-down or bottom-up. +DISTRO_FEATURES += " ipv4" |