[oe-commits] Khem Raj : sane-toolchain.inc: Rename the absration vars for uclibc/eglibc/ glibc versions
git version control
git at git.openembedded.org
Wed Nov 24 16:39:31 UTC 2010
Module: openembedded.git
Branch: release-2010.12
Commit: f7820f0142c4e2dfbe0d5780942b1573b6a49a9d
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f7820f0142c4e2dfbe0d5780942b1573b6a49a9d
Author: Khem Raj <raj.khem at gmail.com>
Date: Wed Nov 24 08:13:32 2010 -0800
sane-toolchain.inc: Rename the absration vars for uclibc/eglibc/glibc versions
* There was a mismatch between sane-toolchain.inc and what
sane-toolchain-uclibc expects. It did not pick right uclibc version
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
conf/distro/include/sane-toolchain.inc | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index 731786b..6653f73 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -6,16 +6,16 @@
# Base line versions, good for most things
PREFERRED_GCC_VERSION ?= "4.5"
-PREFERRED_BINUTILS ?= "2.20.1"
-PREFERRED_UCLIBC ?= "git"
-PREFERRED_EGLIBC ?= "2.12"
-PREFERRED_GLIBC ?= "2.10.1"
+PREFERRED_BINUTILS_VERSION ?= "2.20.1"
+PREFERRED_UCLIBC_VERSION ?= "git"
+PREFERRED_EGLIBC_VERSION ?= "2.12"
+PREFERRED_GLIBC_VERSION ?= "2.10.1"
# Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
-PREFERRED_VERSION_glibc ?= "${PREFERRED_GLIBC}"
-PREFERRED_VERSION_glibc-initial ?= "${PREFERRED_GLIBC}"
-PREFERRED_VERSION_eglibc ?= "${PREFERRED_EGLIBC}"
-PREFERRED_VERSION_eglibc-initial ?= "${PREFERRED_EGLIBC}"
+PREFERRED_VERSION_glibc ?= "${PREFERRED_GLIBC_VERSION}"
+PREFERRED_VERSION_glibc-initial ?= "${PREFERRED_GLIBC_VERSION}"
+PREFERRED_VERSION_eglibc ?= "${PREFERRED_EGLIBC_VERSION}"
+PREFERRED_VERSION_eglibc-initial ?= "${PREFERRED_EGLIBC_VERSION}"
# Some systems need a special gcc version
PREFERRED_GCC_VERSION_486sx ?= "4.3.2"
@@ -32,9 +32,9 @@ PREFERRED_VERSION_linux-libc-headers ?= "2.6.31"
#KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
# Binutils
-PREFERRED_VERSION_binutils ?= "${PREFERRED_BINUTILS}"
-PREFERRED_VERSION_binutils-cross ?= "${PREFERRED_BINUTILS}"
-PREFERRED_VERSION_binutils-cross-sdk ?= "${PREFERRED_BINUTILS}"
+PREFERRED_VERSION_binutils ?= "${PREFERRED_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross ?= "${PREFERRED_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross-sdk ?= "${PREFERRED_BINUTILS_VERSION}"
# Avr32 only has patches for binutils 2.17 in OE
PREFERRED_VERSION_binutils_avr32 = "2.17"
More information about the Openembedded-commits
mailing list