summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2009-08-23 00:44:24 -0700
committerKhem Raj <raj.khem@gmail.com>2009-08-23 00:44:24 -0700
commit8043677ecf08eca924fdd18822712ccad229a438 (patch)
treec1cdc7158082da9f81be6b0e223cb839e07880d1 /conf
parentb2247b97bb8cbf56fda7aa4736f081ff9165a4c0 (diff)
sane-toolchain: Define eglibc PREFERRED_VERSIONS
Set preferred versions for eglibc to be 2.10. Bump up uclibc PREFERRED_VERSION to 0.9.30.1 and for uclibc add more PREFERRED_PROVIDERS. Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/sane-toolchain-uclibc.inc5
-rw-r--r--conf/distro/include/sane-toolchain.inc6
2 files changed, 9 insertions, 2 deletions
diff --git a/conf/distro/include/sane-toolchain-uclibc.inc b/conf/distro/include/sane-toolchain-uclibc.inc
index 68e5031efc..04935fe46d 100644
--- a/conf/distro/include/sane-toolchain-uclibc.inc
+++ b/conf/distro/include/sane-toolchain-uclibc.inc
@@ -3,7 +3,12 @@
# uclibc:
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libc = "uclibc"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl"
+PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
USE_NLS ?= "no"
USE_NLS_glib-2.0 = "yes"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index 07e1455168..cebe77b4b5 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -11,8 +11,10 @@ PREFERRED_BINUTILS ?= "2.18"
# Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
PREFERRED_VERSION_glibc ?= "2.6.1"
PREFERRED_VERSION_glibc-initial ?= "2.6.1"
-PREFERRED_VERSION_uclibc ?= "0.9.30"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.30"
+PREFERRED_VERSION_eglibc ?= "2.10"
+PREFERRED_VERSION_eglibc-initial ?= "2.10"
+PREFERRED_VERSION_uclibc ?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1"
# Some systems need a special gcc version
PREFERRED_GCC_VERSION_486sx ?= "4.3.2"