summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-11-27 17:29:24 -0800
committerSaul Wold <sgw@linux.intel.com>2011-11-29 00:20:06 -0800
commit2278f891a9bd204d82abbd6998cf0921908f1d14 (patch)
tree15f682507500a0423b6a1ef4fcae1b267758cc0a
parent1ec729dfe8e6df9a8d65d939b8a0f2b322196acf (diff)
downloadopenembedded-core-2278f891a9bd204d82abbd6998cf0921908f1d14.tar.gz
openembedded-core-2278f891a9bd204d82abbd6998cf0921908f1d14.tar.bz2
openembedded-core-2278f891a9bd204d82abbd6998cf0921908f1d14.zip
toolchain-scripts.bbclass: Make it work when TCLIBC=uclibc
This class currently only works with eglibc. Since it adds dependencies explicitly on eglibc when using uclibc this creates problems. So we make sure that it checks for TCLIBC to determine system C library in use Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/classes/toolchain-scripts.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index c936a27a49..5fb6cd3aaf 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -104,7 +104,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 = "eglibc ncurses"
+TOOLCHAIN_NEED_CONFIGSITE_CACHE = "ncurses"
#This function create a site config file
toolchain_create_sdk_siteconfig () {
@@ -112,7 +112,9 @@ 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
@@ -140,5 +142,7 @@ python __anonymous () {
deps = d.getVarFlag('do_configure', 'depends') or ""
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.setVarFlag('do_configure', 'depends', deps)
}