diff options
| author | Bogdan Marinescu <bogdan.a.marinescu@intel.com> | 2012-07-19 15:00:13 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-19 17:18:09 +0100 |
| commit | 99ed56ff38bb8ffac849c059905578e11df8f037 (patch) | |
| tree | cbf328eafea440f7d0edd0992d8a41d8c07cf003 /meta | |
| parent | 05e2aa51cb50fd04827c3f779a1aded8c17128ba (diff) | |
| download | poky-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')
| -rw-r--r-- | meta/conf/multilib.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 2ee4ab2794..a23a0eec70 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf | |||
| @@ -6,6 +6,7 @@ MULTILIB_SAVE_VARNAME = "DEFAULTTUNE" | |||
| 6 | 6 | ||
| 7 | MULTILIBS ??= "multilib:lib32" | 7 | MULTILIBS ??= "multilib:lib32" |
| 8 | 8 | ||
| 9 | STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}" | ||
| 9 | STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" | 10 | STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" |
| 10 | STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" | 11 | STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" |
| 11 | 12 | ||
| @@ -511,6 +512,7 @@ BBCLASSEXTEND_append_pn-pax-utils = " ${MULTILIBS}" | |||
| 511 | BBCLASSEXTEND_append_pn-pciutils = " ${MULTILIBS}" | 512 | BBCLASSEXTEND_append_pn-pciutils = " ${MULTILIBS}" |
| 512 | BBCLASSEXTEND_append_pn-pcmanfm = " ${MULTILIBS}" | 513 | BBCLASSEXTEND_append_pn-pcmanfm = " ${MULTILIBS}" |
| 513 | BBCLASSEXTEND_append_pn-pcmciautils = " ${MULTILIBS}" | 514 | BBCLASSEXTEND_append_pn-pcmciautils = " ${MULTILIBS}" |
| 515 | BBCLASSEXTEND_append_pn-perf = " ${MULTILIBS}" | ||
| 514 | BBCLASSEXTEND_append_pn-perl = " ${MULTILIBS}" | 516 | BBCLASSEXTEND_append_pn-perl = " ${MULTILIBS}" |
| 515 | BBCLASSEXTEND_append_pn-pixman = " ${MULTILIBS}" | 517 | BBCLASSEXTEND_append_pn-pixman = " ${MULTILIBS}" |
| 516 | BBCLASSEXTEND_append_pn-pkgconfig = " ${MULTILIBS}" | 518 | BBCLASSEXTEND_append_pn-pkgconfig = " ${MULTILIBS}" |