summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 () {
104#we get the cached site config in the runtime 104#we get the cached site config in the runtime
105TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}" 105TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}"
106TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d" 106TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d"
107TOOLCHAIN_NEED_CONFIGSITE_CACHE = "eglibc ncurses" 107TOOLCHAIN_NEED_CONFIGSITE_CACHE = "ncurses"
108 108
109#This function create a site config file 109#This function create a site config file
110toolchain_create_sdk_siteconfig () { 110toolchain_create_sdk_siteconfig () {
@@ -112,7 +112,9 @@ toolchain_create_sdk_siteconfig () {
112 112
113 rm -f $siteconfig 113 rm -f $siteconfig
114 touch $siteconfig 114 touch $siteconfig
115 115 if [ "${LIBC}" = "eglibc" ]; then
116 TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TOOLCHAIN_NEED_CONFIGSITE_CACHE} eglibc"
117 fi
116 for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do 118 for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do
117 cat $sitefile >> $siteconfig 119 cat $sitefile >> $siteconfig
118 done 120 done
@@ -140,5 +142,7 @@ python __anonymous () {
140 deps = d.getVarFlag('do_configure', 'depends') or "" 142 deps = d.getVarFlag('do_configure', 'depends') or ""
141 for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split(): 143 for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split():
142 deps += " %s:do_populate_sysroot" % dep 144 deps += " %s:do_populate_sysroot" % dep
145 if d.getVar('TCLIBC', True) is "uclibc":
146 deps += "uclibc:do_populate_sysroot"
143 d.setVarFlag('do_configure', 'depends', deps) 147 d.setVarFlag('do_configure', 'depends', deps)
144} 148}