summaryrefslogtreecommitdiffstats
path: root/meta/conf/multilib.conf
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2012-07-19 12:00:13 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-19 16:18:09 (GMT)
commit99ed56ff38bb8ffac849c059905578e11df8f037 (patch)
treecbf328eafea440f7d0edd0992d8a41d8c07cf003 /meta/conf/multilib.conf
parent05e2aa51cb50fd04827c3f779a1aded8c17128ba (diff)
downloadpoky-99ed56ff38bb8ffac849c059905578e11df8f037.tar.gz
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>
Diffstat (limited to 'meta/conf/multilib.conf')
-rw-r--r--meta/conf/multilib.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 2ee4ab2..a23a0ee 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -6,6 +6,7 @@ MULTILIB_SAVE_VARNAME = "DEFAULTTUNE"
6 6
7MULTILIBS ??= "multilib:lib32" 7MULTILIBS ??= "multilib:lib32"
8 8
9STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"
9STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" 10STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
10STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" 11STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
11 12
@@ -511,6 +512,7 @@ BBCLASSEXTEND_append_pn-pax-utils = " ${MULTILIBS}"
511BBCLASSEXTEND_append_pn-pciutils = " ${MULTILIBS}" 512BBCLASSEXTEND_append_pn-pciutils = " ${MULTILIBS}"
512BBCLASSEXTEND_append_pn-pcmanfm = " ${MULTILIBS}" 513BBCLASSEXTEND_append_pn-pcmanfm = " ${MULTILIBS}"
513BBCLASSEXTEND_append_pn-pcmciautils = " ${MULTILIBS}" 514BBCLASSEXTEND_append_pn-pcmciautils = " ${MULTILIBS}"
515BBCLASSEXTEND_append_pn-perf = " ${MULTILIBS}"
514BBCLASSEXTEND_append_pn-perl = " ${MULTILIBS}" 516BBCLASSEXTEND_append_pn-perl = " ${MULTILIBS}"
515BBCLASSEXTEND_append_pn-pixman = " ${MULTILIBS}" 517BBCLASSEXTEND_append_pn-pixman = " ${MULTILIBS}"
516BBCLASSEXTEND_append_pn-pkgconfig = " ${MULTILIBS}" 518BBCLASSEXTEND_append_pn-pkgconfig = " ${MULTILIBS}"