diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2014-11-10 20:09:29 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-12 15:36:13 +0000 |
| commit | 1f05aaa4944ddac6c2b3ba440effdf1eaf732656 (patch) | |
| tree | 1c84f99f0ed93f9765a1101a5017490cc6ce7b8b /meta/classes/siteconfig.bbclass | |
| parent | 3562603044e908aacece86985bc8e4d7338622ac (diff) | |
| download | openembedded-core-contrib-1f05aaa4944ddac6c2b3ba440effdf1eaf732656.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.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/siteconfig.bbclass')
| -rw-r--r-- | meta/classes/siteconfig.bbclass | 8 |
1 files changed, 4 insertions, 4 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 () { >${WORKDIR}/site_config_${MACHINE}/configure.ac cd ${WORKDIR}/site_config_${MACHINE} autoconf - rm -f ${PN}_cache - CONFIG_SITE="" ${EXTRASITECONFIG} ./configure ${CONFIGUREOPTS} --cache-file ${PN}_cache + rm -f ${BPN}_cache + CONFIG_SITE="" ${EXTRASITECONFIG} ./configure ${CONFIGUREOPTS} --cache-file ${BPN}_cache sed -n -e "/ac_cv_c_bigendian/p" -e "/ac_cv_sizeof_/p" \ -e "/ac_cv_type_/p" -e "/ac_cv_header_/p" -e "/ac_cv_func_/p" \ - < ${PN}_cache > ${PN}_config + < ${BPN}_cache > ${BPN}_config mkdir -p ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d - cp ${PN}_config ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d + cp ${BPN}_config ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d } |