pkg-config-native: pick additional search paths from $EXTRA_NATIVE_PKGCONFIG_PATH

This was prompted by working on librsvg update: the new meson-driven
version wants to query values from .pc files residing in its own
build directory, and modifies PKG_CONFIG_PATH accordingly.

When using the pkg-config-native wrapper such modifications
have no effect, and we have to pass them in manually
from the recipe via EXTRA_NATIVE_PKGCONFIG_PATH variable.

This variable is already defined (with an empty value) and
appended to PKG_CONFIG_PATH export in the native class, so this
simply extends its use to the wrapper.

(Appending to PKG_CONFIG_PATH in the wrapper, instead of resetting it,
is not an option as that can lead to contamination with the cross values).

(From OE-Core rev: 2bc050146d47b14d890a1b0db2b55f9057a08b65)

(From OE-Core rev: 104737073bd553b9cf93db7ed9575fd50ba6c973)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Alexander Kanavin
2025-02-06 10:44:02 -05:00
committed by Steve Sakoman
parent 6d1fef08e1
commit c7e8807ddd
2 changed files with 2 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
#! /bin/sh
PKG_CONFIG_PATH="@PATH_NATIVE@"
PKG_CONFIG_PATH="$EXTRA_NATIVE_PKGCONFIG_PATH@PATH_NATIVE@"
unset PKG_CONFIG_SYSROOT_DIR
pkg-config "$@"

View File

@@ -1,6 +1,6 @@
#! /bin/sh
export PKG_CONFIG_PATH="@PATH_NATIVE@"
export PKG_CONFIG_PATH="$EXTRA_NATIVE_PKGCONFIG_PATH@PATH_NATIVE@"
export PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
unset PKG_CONFIG_SYSROOT_DIR