From 8447aa2faef3f4bdb544ab4db45a8e64189ef099 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Fri, 23 Mar 2012 16:33:05 +0800 Subject: meta-toolchain: Popluated the libc siteconfig files. Fixed bug [YOCTO #2159] by correctly populate the libc's siteconfig files. (From OE-Core rev: eeee4b8c097e60070e4654a223b41fea0c96a12b) Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- meta/classes/toolchain-scripts.bbclass | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 711efd39ab..2099c4def8 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) } -- cgit v1.2.3-54-g00ecf