Like gcc and binutils consolidate different PREFERRED_VERSIONS
which use eglibc/glibc/glibc
Bump eglibc to 2.15 for angstrom bleeding
Signed-off-by: Khem Raj <raj.k...@gmail.com>
---
conf/distro/angstrom-2010.x.conf | 33 ++++++++++++++++++++-------------
conf/distro/angstrom-bleeding.conf | 18 ++++--------------
2 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf
index 0b35da0..5798c37 100644
--- a/conf/distro/angstrom-2010.x.conf
+++ b/conf/distro/angstrom-2010.x.conf
@@ -72,20 +72,27 @@ PREFERRED_VERSION_linux-libc-headers-native =
"${LINUX_LIBC_HEADERS_VERSION}"
PREFERRED_VERSION_linux-libc-headers-nativesdk =
"${LINUX_LIBC_HEADERS_VERSION}"
+ANGSTROM_EGLIBC_VERSION ?= "2.12"
+ANGSTROM_GLIBC_VERSION ?= "2.10.1"
+ANGSTROM_UCLIBC_VERSION ?= "0.9.32"
+
#Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
-PREFERRED_VERSION_glibc ?= "2.10.1"
-PREFERRED_VERSION_glibc-initial ?= "2.10.1"
-PREFERRED_VERSION_glibc-nativesdk ?= "2.10.1"
-PREFERRED_VERSION_glibc-initial-nativesdk = "2.10.1"
-PREFERRED_VERSION_uclibc ?= "0.9.32"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.32"
-PREFERRED_VERSION_uclibc-nativesdk ?= "0.9.32"
-PREFERRED_VERSION_uclibc-initial-nativesdk ?= "0.9.32"
-PREFERRED_VERSION_eglibc ?= "2.12"
-PREFERRED_VERSION_eglibc-initial ?= "2.12"
-PREFERRED_VERSION_eglibc-nativesdk ?= "2.12"
-PREFERRED_VERSION_eglibc-initial-nativesdk ?= "2.12"
-PREFERRED_VERSION_eglibc-locale ?= "2.12"
+PREFERRED_VERSION_glibc ?= "${ANGSTROM_GLIBC_VERSION}"
+PREFERRED_VERSION_glibc-initial ?= "${ANGSTROM_GLIBC_VERSION}"
+PREFERRED_VERSION_glibc-nativesdk ?= "${ANGSTROM_GLIBC_VERSION}"
+PREFERRED_VERSION_glibc-initial-nativesdk = "${ANGSTROM_GLIBC_VERSION}"
+
+PREFERRED_VERSION_uclibc ?= "${ANGSTROM_UCLIBC_VERSION}"
+PREFERRED_VERSION_uclibc-initial ?= "${ANGSTROM_UCLIBC_VERSION}"
+PREFERRED_VERSION_uclibc-nativesdk ?= "${ANGSTROM_UCLIBC_VERSION}"
+PREFERRED_VERSION_uclibc-initial-nativesdk ?= "${ANGSTROM_UCLIBC_VERSION}"
+
+PREFERRED_VERSION_eglibc ?= "${ANGSTROM_EGLIBC_VERSION}"
+PREFERRED_VERSION_eglibc-initial ?= "${ANGSTROM_EGLIBC_VERSION}"
+PREFERRED_VERSION_eglibc-nativesdk ?= "${ANGSTROM_EGLIBC_VERSION}"
+PREFERRED_VERSION_eglibc-initial-nativesdk ?= "${ANGSTROM_EGLIBC_VERSION}"
+PREFERRED_VERSION_eglibc-locale ?= "${ANGSTROM_EGLIBC_VERSION}"
+PREFERRED_VERSION_cross-localedef-native ?= "${ANGSTROM_EGLIBC_VERSION}"
#powerpc needs additional patches to gcc
ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1"
diff --git a/conf/distro/angstrom-bleeding.conf
b/conf/distro/angstrom-bleeding.conf
index 56550da..3b24cef 100644
--- a/conf/distro/angstrom-bleeding.conf
+++ b/conf/distro/angstrom-bleeding.conf
@@ -1,20 +1,10 @@
# Bleeding edge version of angstrom
# Only use for toolchain testing!
-ANGSTROM_GCC_VERSION ?= "4.6%"
-ANGSTROM_BINUTILS_VERSION ?= "2.22"
-
-PREFERRED_VERSION_eglibc ?= "2.14"
-PREFERRED_VERSION_eglibc-initial ?= "2.14"
-PREFERRED_VERSION_eglibc-nativesdk ?= "2.14"
-PREFERRED_VERSION_eglibc-initial-nativesdk ?= "2.14"
-PREFERRED_VERSION_eglibc-locale ?= "2.14"
-PREFERRED_VERSION_cross-localedef-native ?= "2.14"
-
-PREFERRED_VERSION_uclibc ?= "0.9.32+0.9.33%"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.32+0.9.33%"
-PREFERRED_VERSION_uclibc-nativesdk ?= "0.9.32+0.9.33%"
-PREFERRED_VERSION_uclibc-initial-nativesdk ?= "0.9.32+0.9.33%"
+ANGSTROM_GCC_VERSION ?= "4.6%"
+ANGSTROM_BINUTILS_VERSION ?= "2.22"
+ANGSTROM_EGLIBC_VERSION ?= "2.15"
+ANGSTROM_UCLIBC_VERSION ?= "0.9.32+0.9.33%"
require angstrom-2010.x.conf
--
1.7.5.4
_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
