summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2018-02-19 10:36:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-24 10:31:46 +0000
commit6c0c3220aa82e3cace95a1184592985163bc0efd (patch)
treea06bd634bef8b4cb2910dca4934c54aac7bfdeee
parentda70697fc3a1e58baee405b1a0e7bc24f615362d (diff)
downloadpoky-6c0c3220aa82e3cace95a1184592985163bc0efd.tar.gz
pkgconf: upgrade to version 1.4.2
pkgconf improved compatibility with freedesktop.org pkg-config. So, we don't need to unset PKG_CONFIG_SYSROOT_DIR in wrappers. (From OE-Core rev: bff4ad7d6f62131a9b91a4063600e6f3edb8843c) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in4
-rw-r--r--meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in1
-rwxr-xr-xmeta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper9
-rw-r--r--meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb (renamed from meta/recipes-devtools/pkgconf/pkgconf_1.4.0.bb)4
4 files changed, 3 insertions, 15 deletions
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in
index 4fc9b0a4a7..d4ac71dff2 100644
--- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in
+++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in
@@ -5,7 +5,6 @@
5if [ "pkg-config-native" = "`basename $0`" ] ; then 5if [ "pkg-config-native" = "`basename $0`" ] ; then
6 PKG_CONFIG_PATH="@PATH_NATIVE@" 6 PKG_CONFIG_PATH="@PATH_NATIVE@"
7 PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" 7 PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
8 unset PKG_CONFIG_SYSROOT_DIR
9else 8else
10 # in this case check if we are in the esdk 9 # in this case check if we are in the esdk
11 if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then 10 if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then
@@ -16,9 +15,8 @@ else
16 if ( echo $parentpid_info | grep -q check-lxdialog ) ; then 15 if ( echo $parentpid_info | grep -q check-lxdialog ) ; then
17 PKG_CONFIG_PATH="@PATH_NATIVE@" 16 PKG_CONFIG_PATH="@PATH_NATIVE@"
18 PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" 17 PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
19 unset PKG_CONFIG_SYSROOT_DIR
20 fi 18 fi
21 fi 19 fi
22fi 20fi
23 21
24pkg-config.real "$@" 22pkg-config "$@"
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
index 9ed30a0d80..c2e86e5ac1 100644
--- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
+++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
@@ -1,6 +1,5 @@
1#! /bin/sh 1#! /bin/sh
2 2
3PKG_CONFIG_PATH="@PATH_NATIVE@" 3PKG_CONFIG_PATH="@PATH_NATIVE@"
4unset PKG_CONFIG_SYSROOT_DIR
5 4
6pkg-config "$@" 5pkg-config "$@"
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
index 695f349566..fc9b48803f 100755
--- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
+++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
@@ -4,13 +4,4 @@
4# Copyright (C) 2015 Christopher Larson <chris_larson@mentor.com> 4# Copyright (C) 2015 Christopher Larson <chris_larson@mentor.com>
5# License: MIT (see COPYING.MIT at the root of the repository for terms) 5# License: MIT (see COPYING.MIT at the root of the repository for terms)
6 6
7for arg; do
8 case "$arg" in
9 --variable|--variable=*)
10 # pkg-config doesn't sysroot-prefix user variables
11 unset PKG_CONFIG_SYSROOT_DIR
12 ;;
13 esac
14done
15
16exec pkgconf "$@" 7exec pkgconf "$@"
diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.4.0.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb
index 48ba5982e3..ea7b666021 100644
--- a/meta/recipes-devtools/pkgconf/pkgconf_1.4.0.bb
+++ b/meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb
@@ -21,8 +21,8 @@ SRC_URI = "\
21 file://pkg-config-native.in \ 21 file://pkg-config-native.in \
22 file://pkg-config-esdk.in \ 22 file://pkg-config-esdk.in \
23" 23"
24SRC_URI[md5sum] = "c509c0dad5a70aa4bc3210557b7eafce" 24SRC_URI[md5sum] = "678d242b4eef1754bba6a58642af10bb"
25SRC_URI[sha256sum] = "1d112ff35dad516ffbfbdb013df3a035140618fe7632ec44ffa894a9c713301b" 25SRC_URI[sha256sum] = "bab39371d4ab972be1d539a8b10b6cc21f8eafc97f617102e667e82bd32eb234"
26 26
27inherit autotools update-alternatives 27inherit autotools update-alternatives
28 28