summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/siteconfig.bbclass8
-rw-r--r--meta/classes/toolchain-scripts.bbclass4
-rw-r--r--meta/recipes-core/meta/meta-environment.bb1
3 files changed, 8 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}
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 9d8bcb71de..bb208a39aa 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -42,6 +42,7 @@ python do_generate_content() {
42 # Load overrides from 'd' to avoid having to reset the value... 42 # Load overrides from 'd' to avoid having to reset the value...
43 overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item 43 overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item
44 localdata.setVar("OVERRIDES", overrides) 44 localdata.setVar("OVERRIDES", overrides)
45 localdata.setVar("MLPREFIX", item + "-")
45 bb.data.update_data(localdata) 46 bb.data.update_data(localdata)
46 bb.build.exec_func("create_sdk_files", localdata) 47 bb.build.exec_func("create_sdk_files", localdata)
47} 48}