From: Peter Bergin <peter@berginkonsult.se>
Date: Wed, 19 Mar 2025 16:13:27 +0000 (+0100)
Subject: pkg-config-native,librsvg-native: fix EXTRA_NATIVE_PKGCONFIG_PATH
X-Git-Tag: yocto-5.2~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a59fa4a4bf08bbbd79fbb1642b3e3b23181f87c9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

pkg-config-native,librsvg-native: fix EXTRA_NATIVE_PKGCONFIG_PATH

When building librsvg-native the variable PKG_CONFIG_PATH
was incorrect in the bitbake environment but handled correct due
to the pkg-config-native wrapper. Commit [1] and [2]
introduced some inconsistens of EXTRA_NATIVE_PKGCONFIG_PATH
where it was prepended in pkg-config-native wrappers but
appended in native.bbclass.

  meta/classes-recipe/native.bbclass:
    PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"

This commit will try to resolve this to always append the
EXTRA_NATIVE_PKGCONFIG_PATH. It is tested by building
librsvg-native and also checking bitbake environment
before and after.

[1] https://git.openembedded.org/openembedded-core/commit?id=2bc050146d47b14d890a1b0db2b55f9057a08b65
[2] https://git.openembedded.org/openembedded-core/commit?id=ae4824f4f6234884a245bce314d6305ad8eb982d

Signed-off-by: Peter Bergin <peter@berginkonsult.se>
Cc: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
index fd5ab6b1fab..0d736fe4d46 100644
--- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
+++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-PKG_CONFIG_PATH="$EXTRA_NATIVE_PKGCONFIG_PATH@PATH_NATIVE@"
+PKG_CONFIG_PATH="@PATH_NATIVE@$EXTRA_NATIVE_PKGCONFIG_PATH"
 unset PKG_CONFIG_SYSROOT_DIR
 
 pkg-config "$@"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in b/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
index d4bb4f8c06f..8addefbb803 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-export PKG_CONFIG_PATH="$EXTRA_NATIVE_PKGCONFIG_PATH@PATH_NATIVE@"
+export PKG_CONFIG_PATH="@PATH_NATIVE@$EXTRA_NATIVE_PKGCONFIG_PATH"
 export PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
 unset PKG_CONFIG_SYSROOT_DIR
 
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.59.2.bb b/meta/recipes-gnome/librsvg/librsvg_2.59.2.bb
index 7718f2bb481..983fc75eed8 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.59.2.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.59.2.bb
@@ -34,7 +34,7 @@ UPSTREAM_CHECK_REGEX = "librsvg-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
 # for cargo to be happy
 BASEDEPENDS:append = " cargo-native"
 
-export EXTRA_NATIVE_PKGCONFIG_PATH = "${B}/meson-uninstalled:"
+export EXTRA_NATIVE_PKGCONFIG_PATH = ":${B}/meson-uninstalled"
 export RUST_BACKTRACE = "full"
 export RUSTFLAGS