summaryrefslogtreecommitdiffstats
path: root/meta/conf/multilib.conf
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-02 03:45:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-02 17:15:31 (GMT)
commit6ebcc6c1999f678dace87a4716aa912acaf88ad4 (patch)
tree0f6ee46bb7293c5ff4cdc149b0dee1b4b38fc1b3 /meta/conf/multilib.conf
parent7046e28afc602b1cd981ed76dc9467d0869c098c (diff)
downloadpoky-6ebcc6c1999f678dace87a4716aa912acaf88ad4.tar.gz
multilib: Using different sysroot for multilib recipes
Thinking of the senario that, if we already built out a 64bit image along with the full toolchain bootstrapped, then we need to build some 32bit libraries, which needs lib32 versions of gcc and eglibc. These toolchain recipes will bootstrap again in the same sysroot, resulting that lib32-gcc-cross-initial will find some macros owned by eglibc have already been defined and thus it includes non-existed headers that provided by later lib32-eglibc. The solution for the above issue is to use different sysroot for multilib recipes, here we add ${MLPREFIX} in front of the machine specific sysroot directory name. [YOCTO #1372] (From OE-Core rev: a1508ad1aec2d2f9ee040aa217c33193cd5bd871) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/multilib.conf')
-rw-r--r--meta/conf/multilib.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 36793d2..df83d47 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -6,6 +6,9 @@ MULTILIB_SAVE_VARNAME = "DEFAULTTUNE"
6 6
7MULTILIBS ??= "multilib:lib32" 7MULTILIBS ??= "multilib:lib32"
8 8
9STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
10STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
11
9BBCLASSEXTEND_append_pn-acl = " ${MULTILIBS}" 12BBCLASSEXTEND_append_pn-acl = " ${MULTILIBS}"
10BBCLASSEXTEND_append_pn-alsa-lib = " ${MULTILIBS}" 13BBCLASSEXTEND_append_pn-alsa-lib = " ${MULTILIBS}"
11BBCLASSEXTEND_append_pn-alsa-utils = " ${MULTILIBS}" 14BBCLASSEXTEND_append_pn-alsa-utils = " ${MULTILIBS}"