[oe] [PATCH] sane-toolchain: use hard assignment instead of weak for libtool version and LIBTOOL_HAS_SYSROOT
Martin Jansa
martin.jansa at gmail.com
Fri Dec 17 00:16:51 UTC 2010
* bitbake.conf already has weak LIBTOOL_HAS_SYSROOT ?= "no" so setting to "yes" here was ignored
---
conf/distro/include/sane-toolchain.inc | 8 ++++++--
conf/distro/shr.conf | 3 ---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index c0a4021..e29893a 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -10,8 +10,12 @@ PREFERRED_BINUTILS_VERSION ?= "2.20.1"
PREFERRED_UCLIBC_VERSION ?= "git"
PREFERRED_EGLIBC_VERSION ?= "2.12"
PREFERRED_GLIBC_VERSION ?= "2.10.1"
-PREFERRED_LIBTOOL_VERSION ?= "2.4"
-LIBTOOL_HAS_SYSROOT ?= "yes"
+# we need hard assignment here, because bitbake.conf has
+# weak "no" first so weak "yes" here won't override it
+# also use hard assignment for version to make sure it's
+# new enough for SYSROOT support
+PREFERRED_LIBTOOL_VERSION = "2.4"
+LIBTOOL_HAS_SYSROOT = "yes"
# Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
PREFERRED_VERSION_glibc ?= "${PREFERRED_GLIBC_VERSION}"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 6295ff3..0258231 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -159,9 +159,6 @@ MACHINE_OVERRIDES += "${MACHINE_CLASS}"
# TOOLCHAIN
#############################################################################
LIBC ?= "eglibc"
-# it's needed here without weak assignment, because bitbake.conf has
-# weak "no" first and weak "yes" in sane-toolchain is then ignored
-LIBTOOL_HAS_SYSROOT = "yes"
require conf/distro/include/sane-toolchain.inc
require conf/distro/include/arm-thumb.inc
--
1.7.3.3
More information about the Openembedded-devel
mailing list