summaryrefslogtreecommitdiffstats
path: root/meta/conf/multilib.conf
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2024-07-12 12:46:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-13 23:28:31 +0100
commita3518ccb6be7d8e315c3840550381c60aeace5c6 (patch)
tree1474d4cfd4465ab9241bc9f4ded7610cd86d455c /meta/conf/multilib.conf
parent1cf0974ad242f7eb2815a4ef0e3e5b6507ca56ea (diff)
downloadpoky-a3518ccb6be7d8e315c3840550381c60aeace5c6.tar.gz
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: e6e6076f1956c711814c14d76194794d950e45f8) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/multilib.conf')
-rw-r--r--meta/conf/multilib.conf9
1 files changed, 0 insertions, 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"
22 22
23OPKG_ARGS:append = " --force-maintainer --force-overwrite" 23OPKG_ARGS:append = " --force-maintainer --force-overwrite"
24 24
25# When multilib is enabled, allarch recipes will be installed into the MACHINE
26# sysroot, not MLPREFIXMACHINE. This means that anything using pkg-config to
27# find an allarch pkgconfig file will fail as the PKG_CONFIG_PATH only looks
28# inside the multilib sysroot. Fix this by explicitly adding the MACHINE's
29# architecture-independent pkgconfig location to PKG_CONFIG_PATH.
30PKG_CONFIG_PATH .= ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig"
31PKG_CONFIG_PATH[vardepsexclude] = "datadir WORKDIR"
32PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig"
33
34# These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES 25# These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES
35# ${MLPREFIX}${BPN} 26# ${MLPREFIX}${BPN}
36NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf u-boot" 27NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf u-boot"