summaryrefslogtreecommitdiffstats
path: root/meta/conf/multilib.conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/conf/multilib.conf
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/multilib.conf')
-rw-r--r--meta/conf/multilib.conf8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index d231107f8b..8a8db582df 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -1,5 +1,5 @@
1 1
2baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" 2baselib = "${@d.getVar('BASE_LIB:tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}"
3 3
4MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" 4MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
5MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" 5MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR"
@@ -9,15 +9,15 @@ MULTILIBS ??= "multilib:lib32"
9STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" 9STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
10STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" 10STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
11RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" 11RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
12RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot" 12RECIPE_SYSROOT:class-native = "${WORKDIR}/recipe-sysroot"
13 13
14INHERIT += "multilib_global" 14INHERIT += "multilib_global"
15 15
16BBCLASSEXTEND_append = " ${MULTILIBS}" 16BBCLASSEXTEND:append = " ${MULTILIBS}"
17 17
18MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32" 18MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32"
19 19
20OPKG_ARGS_append = " --force-maintainer --force-overwrite" 20OPKG_ARGS:append = " --force-maintainer --force-overwrite"
21 21
22# When multilib is enabled, allarch recipes will be installed into the MACHINE 22# When multilib is enabled, allarch recipes will be installed into the MACHINE
23# sysroot, not MLPREFIXMACHINE. This means that anything using pkg-config to 23# sysroot, not MLPREFIXMACHINE. This means that anything using pkg-config to