diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2025-02-06 10:44:02 -0500 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-02-12 06:25:37 -0800 |
| commit | c7e8807ddd2671956d9e1d15303e36dff9a22727 (patch) | |
| tree | 26c6e0401bb492ae320d022da21b750effd415bb /meta/recipes-devtools | |
| parent | 6d1fef08e1410eaad6ed57e480647550dbda1e3f (diff) | |
| download | poky-c7e8807ddd2671956d9e1d15303e36dff9a22727.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in index 9ed30a0d80..fd5ab6b1fa 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 @@ | |||
| 1 | #! /bin/sh | 1 | #! /bin/sh |
| 2 | 2 | ||
| 3 | PKG_CONFIG_PATH="@PATH_NATIVE@" | 3 | PKG_CONFIG_PATH="$EXTRA_NATIVE_PKGCONFIG_PATH@PATH_NATIVE@" |
| 4 | unset PKG_CONFIG_SYSROOT_DIR | 4 | unset PKG_CONFIG_SYSROOT_DIR |
| 5 | 5 | ||
| 6 | pkg-config "$@" | 6 | 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 a9324de4cf..d4bb4f8c06 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 @@ | |||
| 1 | #! /bin/sh | 1 | #! /bin/sh |
| 2 | 2 | ||
| 3 | export PKG_CONFIG_PATH="@PATH_NATIVE@" | 3 | export PKG_CONFIG_PATH="$EXTRA_NATIVE_PKGCONFIG_PATH@PATH_NATIVE@" |
| 4 | export PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" | 4 | export PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" |
| 5 | unset PKG_CONFIG_SYSROOT_DIR | 5 | unset PKG_CONFIG_SYSROOT_DIR |
| 6 | 6 | ||