toolchain-scripts: add sysroot/usr/share/pkgconfig to PKG_CONFIG_PATH

Otherwise architecture-independent pkg-config files such as wayland-protocols
won't be found in the SDK.

Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 02e69c8400c09ef1677818ac6835cc7c7243008a..32d8c3230950a67b9da89ec5290a64d0172c2fd1 100644 (file)
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -8,7 +8,8 @@ TARGET_CC_ARCH_append_libc-musl = " -mmusl"
 
 # This function creates an environment-setup-script for use in a deployable SDK
 toolchain_create_sdk_env_script () {
-       # Create environment setup script
+       # Create environment setup script.  Remember that $SDKTARGETSYSROOT should
+       # only be expanded on the target at runtime.
        base_sbindir=${10:-${base_sbindir_nativesdk}}
        base_bindir=${9:-${base_bindir_nativesdk}}
        sbindir=${8:-${sbindir_nativesdk}}
@@ -29,7 +30,7 @@ toolchain_create_sdk_env_script () {
        echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH' >> $script
        echo "export CCACHE_PATH=$sdkpathnative$bindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$CCACHE_PATH' >> $script
        echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script
-       echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig' >> $script
+       echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig:$SDKTARGETSYSROOT'"$prefix"'/share/pkgconfig' >> $script
        echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script
        echo "export OECORE_NATIVE_SYSROOT=\"$sdkpathnative\"" >> $script
        echo 'export OECORE_TARGET_SYSROOT="$SDKTARGETSYSROOT"' >> $script