diff options
| author | Peter Bergin <peter@berginkonsult.se> | 2025-03-19 17:13:27 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-20 11:29:04 +0000 |
| commit | 0e32e1cb260aac59cabbbeba26f8f844978a75a0 (patch) | |
| tree | 3eab4f1f279adb271a46b8db6f2e3d305d7bd7cf /meta/recipes-devtools | |
| parent | 7517eed223cbe42efd022fdf759e846331847836 (diff) | |
| download | poky-0e32e1cb260aac59cabbbeba26f8f844978a75a0.tar.gz | |
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
(From OE-Core rev: a59fa4a4bf08bbbd79fbb1642b3e3b23181f87c9)
Signed-off-by: Peter Bergin <peter@berginkonsult.se>
Cc: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 fd5ab6b1fa..0d736fe4d4 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="$EXTRA_NATIVE_PKGCONFIG_PATH@PATH_NATIVE@" | 3 | PKG_CONFIG_PATH="@PATH_NATIVE@$EXTRA_NATIVE_PKGCONFIG_PATH" |
| 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 d4bb4f8c06..8addefbb80 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="$EXTRA_NATIVE_PKGCONFIG_PATH@PATH_NATIVE@" | 3 | export PKG_CONFIG_PATH="@PATH_NATIVE@$EXTRA_NATIVE_PKGCONFIG_PATH" |
| 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 | ||