From: Martin Jansa Date: Thu, 16 Dec 2010 23:25:40 +0000 (+0100) Subject: sane-toolchain: use hard assignment instead of weak for libtool version and LIBTOOL_H... X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ea9be2b5d3ac4fb5da74506c2516b3412726495;p=openembedded.git sane-toolchain: use hard assignment instead of weak for libtool version and LIBTOOL_HAS_SYSROOT * bitbake.conf already has weak LIBTOOL_HAS_SYSROOT ?= "no" so setting to "yes" here was ignored Acked-by: Khem Raj Signed-off-by: Martin Jansa --- diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index c0a4021078..e29893a125 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 6295ff3749..02582313b3 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