diff options
Diffstat (limited to 'meta/conf/multilib.conf')
| -rw-r--r-- | meta/conf/multilib.conf | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index e74dec81a8..ef3605a73d 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -1,7 +1,8 @@ -baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" +baselib = "${@d.getVar('BASE_LIB:tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" +MULTILIB_VARIANTS[vardeps] += "MULTILIBS" MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" MULTILIBS ??= "multilib:lib32" @@ -9,14 +10,17 @@ MULTILIBS ??= "multilib:lib32" STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" +RECIPE_SYSROOT:class-native = "${WORKDIR}/recipe-sysroot" + +PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${MLPREFIX}recipe-sysroot" INHERIT += "multilib_global" -BBCLASSEXTEND_append = " ${MULTILIBS}" +BBCLASSEXTEND:append = " ${MULTILIBS}" MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32" -OPKG_ARGS_append = " --force-maintainer --force-overwrite" +OPKG_ARGS:append = " --force-maintainer --force-overwrite" # When multilib is enabled, allarch recipes will be installed into the MACHINE # sysroot, not MLPREFIXMACHINE. This means that anything using pkg-config to @@ -26,3 +30,7 @@ OPKG_ARGS_append = " --force-maintainer --force-overwrite" PKG_CONFIG_PATH .= ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" PKG_CONFIG_PATH[vardepsexclude] = "datadir WORKDIR" PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" + +# These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES +# ${MLPREFIX}${BPN} +NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf u-boot" |