diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/siteconfig.bbclass | 8 | ||||
-rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 4 |
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 |
93 | TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d, True)}" | 93 | TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d, True)}" |
94 | TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d" | 94 | TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d" |
95 | TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TCLIBC} ncurses" | 95 | TOOLCHAIN_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 | } |