diff options
-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 | ||||
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.59.2.bb | 2 |
3 files changed, 3 insertions, 3 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 | ||
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.59.2.bb b/meta/recipes-gnome/librsvg/librsvg_2.59.2.bb index 7718f2bb48..983fc75eed 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+)" | |||
34 | # for cargo to be happy | 34 | # for cargo to be happy |
35 | BASEDEPENDS:append = " cargo-native" | 35 | BASEDEPENDS:append = " cargo-native" |
36 | 36 | ||
37 | export EXTRA_NATIVE_PKGCONFIG_PATH = "${B}/meson-uninstalled:" | 37 | export EXTRA_NATIVE_PKGCONFIG_PATH = ":${B}/meson-uninstalled" |
38 | export RUST_BACKTRACE = "full" | 38 | export RUST_BACKTRACE = "full" |
39 | export RUSTFLAGS | 39 | export RUSTFLAGS |
40 | 40 | ||