From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 30 Sep 2016 16:43:24 +0000 (+0100)
Subject: multilib.conf: Ensure sstate checksums don't change when using this include
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f03af9ae34a7e6383038a8a21488efc48a603d3;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 50303fb5d6f..1403a034a6d 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -24,4 +24,5 @@ OPKG_ARGS_append = " --force-maintainer --force-overwrite"
 # inside the multilib sysroot.  Fix this by explicitly adding the MACHINE's
 # architecture-independent pkgconfig location to PKG_CONFIG_PATH.
 PKG_CONFIG_PATH .= ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig"
-PKG_CONFIG_PATH[vardepsexclude] = "MACHINE"
+PKG_CONFIG_PATH[vardepsexclude] = "MACHINE datadir STAGING_DIR"
+PKG_CONFIG_PATH[vardepvalueexclude] = ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig"