summaryrefslogtreecommitdiffstats
path: root/meta/conf/multilib.conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-30 17:43:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-01 21:45:57 +0100
commit6f03af9ae34a7e6383038a8a21488efc48a603d3 (patch)
treeeef6193eb7d223f55ac164639574fcd935ce8dde /meta/conf/multilib.conf
parenta9b3a6dade2495fedcb1f54fc97bcf2f7d082ae2 (diff)
downloadpoky-6f03af9ae34a7e6383038a8a21488efc48a603d3.tar.gz
multilib.conf: Ensure sstate checksums don't change when using this include
When enabling multilib.conf, the world was rebuilding due to changes in the pkg-config search path. This doesn't matter so exclude it from the checksums. (From OE-Core rev: 22001ba163e80b114212580279339acd15fa7298) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/multilib.conf')
-rw-r--r--meta/conf/multilib.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 50303fb5d6..1403a034a6 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -24,4 +24,5 @@ OPKG_ARGS_append = " --force-maintainer --force-overwrite"
24# inside the multilib sysroot. Fix this by explicitly adding the MACHINE's 24# inside the multilib sysroot. Fix this by explicitly adding the MACHINE's
25# architecture-independent pkgconfig location to PKG_CONFIG_PATH. 25# architecture-independent pkgconfig location to PKG_CONFIG_PATH.
26PKG_CONFIG_PATH .= ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig" 26PKG_CONFIG_PATH .= ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig"
27PKG_CONFIG_PATH[vardepsexclude] = "MACHINE" 27PKG_CONFIG_PATH[vardepsexclude] = "MACHINE datadir STAGING_DIR"
28PKG_CONFIG_PATH[vardepvalueexclude] = ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig"