From 75c351eb374a87cc5b4f1c92300bf4820cf8b195 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 12 Jul 2024 12:46:11 +0800 Subject: [PATCH] multilib.conf: remove appending to PKG_CONFIG_PATH * Since commit [a23c482cab allarch: only enable allarch when multilib is not used], allarch recipes will also be installed into ${MLPREFIX}recipe-sysroot, so this appending is not needed. * This appending also causes some QA errors. Eg: for lib32-php, the recipe will use 's@${RECIPE_SYSROOT}@@g' to remove host specific path, this appending makes not all the host specific path are matched. (From OE-Core rev: e88f159989cbf8080f0a8fb449c878f2a5747774) Signed-off-by: Changqing Li Signed-off-by: Richard Purdie (cherry picked from commit e6e6076f1956c711814c14d76194794d950e45f8) Signed-off-by: Steve Sakoman --- meta/conf/multilib.conf | 9 --------- 1 file changed, 9 deletions(-) diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index ef3605a73d..09546315b8 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -22,15 +22,6 @@ MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32" 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 -# find an allarch pkgconfig file will fail as the PKG_CONFIG_PATH only looks -# inside the multilib sysroot. Fix this by explicitly adding the MACHINE's -# architecture-independent pkgconfig location to PKG_CONFIG_PATH. -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"