diff options
Diffstat (limited to 'meta/conf/multilib.conf')
-rw-r--r-- | meta/conf/multilib.conf | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index d231107f8b..ef3605a73d 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf | |||
@@ -1,7 +1,8 @@ | |||
1 | 1 | ||
2 | baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" | 2 | baselib = "${@d.getVar('BASE_LIB:tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" |
3 | 3 | ||
4 | MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" | 4 | MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" |
5 | MULTILIB_VARIANTS[vardeps] += "MULTILIBS" | ||
5 | MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" | 6 | MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" |
6 | 7 | ||
7 | MULTILIBS ??= "multilib:lib32" | 8 | MULTILIBS ??= "multilib:lib32" |
@@ -9,15 +10,17 @@ MULTILIBS ??= "multilib:lib32" | |||
9 | STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" | 10 | STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" |
10 | STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" | 11 | STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" |
11 | RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" | 12 | RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" |
12 | RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot" | 13 | RECIPE_SYSROOT:class-native = "${WORKDIR}/recipe-sysroot" |
14 | |||
15 | PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${MLPREFIX}recipe-sysroot" | ||
13 | 16 | ||
14 | INHERIT += "multilib_global" | 17 | INHERIT += "multilib_global" |
15 | 18 | ||
16 | BBCLASSEXTEND_append = " ${MULTILIBS}" | 19 | BBCLASSEXTEND:append = " ${MULTILIBS}" |
17 | 20 | ||
18 | MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32" | 21 | MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32" |
19 | 22 | ||
20 | OPKG_ARGS_append = " --force-maintainer --force-overwrite" | 23 | OPKG_ARGS:append = " --force-maintainer --force-overwrite" |
21 | 24 | ||
22 | # When multilib is enabled, allarch recipes will be installed into the MACHINE | 25 | # When multilib is enabled, allarch recipes will be installed into the MACHINE |
23 | # sysroot, not MLPREFIXMACHINE. This means that anything using pkg-config to | 26 | # sysroot, not MLPREFIXMACHINE. This means that anything using pkg-config to |