summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2012-03-23 16:33:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 12:00:58 +0000
commiteeee4b8c097e60070e4654a223b41fea0c96a12b (patch)
tree9a1531a24b9d960a444a41e2231c0dc614644cd0
parentb92aaf764e6de94fb9fdee610e8f6643ccf74894 (diff)
downloadopenembedded-core-eeee4b8c097e60070e4654a223b41fea0c96a12b.tar.gz
openembedded-core-eeee4b8c097e60070e4654a223b41fea0c96a12b.tar.bz2
openembedded-core-eeee4b8c097e60070e4654a223b41fea0c96a12b.tar.xz
openembedded-core-eeee4b8c097e60070e4654a223b41fea0c96a12b.zip
meta-toolchain: Popluated the libc siteconfig files.
Fixed bug [YOCTO #2159] by correctly populate the libc's siteconfig files. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/toolchain-scripts.bbclass8
-rw-r--r--meta/recipes-core/meta/meta-environment.bb2
-rw-r--r--meta/recipes-core/meta/meta-toolchain.bb2
3 files changed, 4 insertions, 8 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 711efd39a..2099c4def 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -105,7 +105,7 @@ toolchain_create_sdk_env_script_for_installer () {
#we get the cached site config in the runtime
TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}"
TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d"
-TOOLCHAIN_NEED_CONFIGSITE_CACHE = "ncurses"
+TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TCLIBC} ncurses"
#This function create a site config file
toolchain_create_sdk_siteconfig () {
@@ -113,9 +113,7 @@ toolchain_create_sdk_siteconfig () {
rm -f $siteconfig
touch $siteconfig
- if [ "${LIBC}" = "eglibc" ]; then
- TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TOOLCHAIN_NEED_CONFIGSITE_CACHE} eglibc"
- fi
+
for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do
cat $sitefile >> $siteconfig
done
@@ -146,7 +144,5 @@ python __anonymous () {
deps = ""
for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split():
deps += " %s:do_populate_sysroot" % dep
- if d.getVar('TCLIBC', True) is "uclibc":
- deps += "uclibc:do_populate_sysroot"
d.appendVarFlag('do_configure', 'depends', deps)
}
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 8f9391a23..97313000f 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Package of environment files for SDK"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index 1058c68ef..61f9d34f4 100644
--- a/meta/recipes-core/meta/meta-toolchain.bb
+++ b/meta/recipes-core/meta/meta-toolchain.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
-PR = "r6"
+PR = "r7"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"