summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-11-10 20:09:29 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-12 15:38:33 +0000
commitbb213d8e60746d61d80505487d5f14a4eb45231b (patch)
tree3c51dad8b84dbd9237ad12a9b3ac0b0ce445354f /meta/classes
parent8c240ad2472d8a7a5ea8a735fda3c1210c664c0d (diff)
downloadpoky-bb213d8e60746d61d80505487d5f14a4eb45231b.tar.gz
meta-environment: Fix config-site with a multilib config
[YOCTO #6951] The TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value was defaulting to the nativesdk path and not the associated target path. Set the value in toolchain-scripts to the target path. Be sure to set the MLPREFIX within the meta-environment script as multilibs are processed. Update the config_site file name to use -BPN- not PN. Otherwise the environment processing can't find the correct filename. (From OE-Core rev: 1f05aaa4944ddac6c2b3ba440effdf1eaf732656) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/siteconfig.bbclass8
-rw-r--r--meta/classes/toolchain-scripts.bbclass4
2 files changed, 7 insertions, 5 deletions
diff --git a/meta/classes/siteconfig.bbclass b/meta/classes/siteconfig.bbclass
index 9a4d03b887..45dce489de 100644
--- a/meta/classes/siteconfig.bbclass
+++ b/meta/classes/siteconfig.bbclass
@@ -18,13 +18,13 @@ siteconfig_do_siteconfig_gencache () {
18 >${WORKDIR}/site_config_${MACHINE}/configure.ac 18 >${WORKDIR}/site_config_${MACHINE}/configure.ac
19 cd ${WORKDIR}/site_config_${MACHINE} 19 cd ${WORKDIR}/site_config_${MACHINE}
20 autoconf 20 autoconf
21 rm -f ${PN}_cache 21 rm -f ${BPN}_cache
22 CONFIG_SITE="" ${EXTRASITECONFIG} ./configure ${CONFIGUREOPTS} --cache-file ${PN}_cache 22 CONFIG_SITE="" ${EXTRASITECONFIG} ./configure ${CONFIGUREOPTS} --cache-file ${BPN}_cache
23 sed -n -e "/ac_cv_c_bigendian/p" -e "/ac_cv_sizeof_/p" \ 23 sed -n -e "/ac_cv_c_bigendian/p" -e "/ac_cv_sizeof_/p" \
24 -e "/ac_cv_type_/p" -e "/ac_cv_header_/p" -e "/ac_cv_func_/p" \ 24 -e "/ac_cv_type_/p" -e "/ac_cv_header_/p" -e "/ac_cv_func_/p" \
25 < ${PN}_cache > ${PN}_config 25 < ${BPN}_cache > ${BPN}_config
26 mkdir -p ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d 26 mkdir -p ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d
27 cp ${PN}_config ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d 27 cp ${BPN}_config ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d
28 28
29} 29}
30 30
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 2244cf71c1..96fd93dbc8 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -91,7 +91,7 @@ EOF
91 91
92#we get the cached site config in the runtime 92#we get the cached site config in the runtime
93TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d, True)}" 93TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d, True)}"
94TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d" 94TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d"
95TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TCLIBC} ncurses" 95TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TCLIBC} ncurses"
96 96
97#This function create a site config file 97#This function create a site config file
@@ -131,5 +131,7 @@ python __anonymous () {
131 deps = "" 131 deps = ""
132 for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split(): 132 for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split():
133 deps += " %s:do_populate_sysroot" % dep 133 deps += " %s:do_populate_sysroot" % dep
134 for variant in (d.getVar('MULTILIB_VARIANTS', True) or "").split():
135 deps += " %s-%s:do_populate_sysroot" % (variant, dep)
134 d.appendVarFlag('do_configure', 'depends', deps) 136 d.appendVarFlag('do_configure', 'depends', deps)
135} 137}