From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Date: Thu, 19 Jul 2012 12:00:13 +0000 (+0300)
Subject: Multilib build fixes
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99ed56ff38bb8ffac849c059905578e11df8f037;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

Multilib build fixes

1. STAGING_KERNEL_DIR was getting an invalid MLPREFIX. Fix this by forcing the expansion in multilib.conf.
2. Added multilib rule for 'perf'.

(From OE-Core rev: 71907775f601f0a48b995cc3277b61645d2e5068)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 2ee4ab2794d..a23a0eec702 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -6,6 +6,7 @@ MULTILIB_SAVE_VARNAME = "DEFAULTTUNE"
 
 MULTILIBS ??= "multilib:lib32"
 
+STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"
 STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
 STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
 
@@ -511,6 +512,7 @@ BBCLASSEXTEND_append_pn-pax-utils = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-pciutils = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-pcmanfm = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-pcmciautils = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-perf = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-perl = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-pixman = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-pkgconfig = " ${MULTILIBS}"