diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
| commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
| tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/conf/multilib.conf | |
| parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
| download | poky-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.conf | 8 |
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 | ||
| 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_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" | 5 | MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" |
| @@ -9,15 +9,15 @@ MULTILIBS ??= "multilib:lib32" | |||
| 9 | STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" | 9 | STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" |
| 10 | STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" | 10 | STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" |
| 11 | RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" | 11 | RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" |
| 12 | RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot" | 12 | RECIPE_SYSROOT:class-native = "${WORKDIR}/recipe-sysroot" |
| 13 | 13 | ||
| 14 | INHERIT += "multilib_global" | 14 | INHERIT += "multilib_global" |
| 15 | 15 | ||
| 16 | BBCLASSEXTEND_append = " ${MULTILIBS}" | 16 | BBCLASSEXTEND:append = " ${MULTILIBS}" |
| 17 | 17 | ||
| 18 | MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32" | 18 | MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32" |
| 19 | 19 | ||
| 20 | OPKG_ARGS_append = " --force-maintainer --force-overwrite" | 20 | OPKG_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 |
