Patchwork [4/5] multilib: Using different sysroot for multilib recipes

login
register
mail settings
Submitter Dongxiao Xu
Date Sept. 2, 2011, 9:03 a.m.
Message ID <0a7bbc84eda7c0483b1dd1ae55679e1ed463ed39.1314953755.git.dongxiao.xu@intel.com>
Download mbox | patch
Permalink /patch/10895/
State New, archived
Headers show

Comments

Dongxiao Xu - Sept. 2, 2011, 9:03 a.m.
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]

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/conf/multilib.conf |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

Patch

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 9fca715..5329eda 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -6,6 +6,9 @@  MULTILIB_SAVE_VARNAME = "DEFAULTTUNE"
 
 MULTILIBS ??= "multilib:lib32"
 
+STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
+STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
+
 BBCLASSEXTEND_append_pn-acl = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-alsa-lib = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-alsa-utils = " ${MULTILIBS}"