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>
This commit is contained in:
Maxin B. John
2018-02-19 10:36:52 +02:00
committed by Richard Purdie
parent da70697fc3
commit 6c0c3220aa
4 changed files with 3 additions and 15 deletions

View File

@@ -5,7 +5,6 @@
if [ "pkg-config-native" = "`basename $0`" ] ; then
PKG_CONFIG_PATH="@PATH_NATIVE@"
PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
unset PKG_CONFIG_SYSROOT_DIR
else
# in this case check if we are in the esdk
if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then
@@ -16,9 +15,8 @@ else
if ( echo $parentpid_info | grep -q check-lxdialog ) ; then
PKG_CONFIG_PATH="@PATH_NATIVE@"
PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
unset PKG_CONFIG_SYSROOT_DIR
fi
fi
fi
pkg-config.real "$@"
pkg-config "$@"

View File

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

View File

@@ -4,13 +4,4 @@
# Copyright (C) 2015 Christopher Larson <chris_larson@mentor.com>
# License: MIT (see COPYING.MIT at the root of the repository for terms)
for arg; do
case "$arg" in
--variable|--variable=*)
# pkg-config doesn't sysroot-prefix user variables
unset PKG_CONFIG_SYSROOT_DIR
;;
esac
done
exec pkgconf "$@"

View File

@@ -21,8 +21,8 @@ SRC_URI = "\
file://pkg-config-native.in \
file://pkg-config-esdk.in \
"
SRC_URI[md5sum] = "c509c0dad5a70aa4bc3210557b7eafce"
SRC_URI[sha256sum] = "1d112ff35dad516ffbfbdb013df3a035140618fe7632ec44ffa894a9c713301b"
SRC_URI[md5sum] = "678d242b4eef1754bba6a58642af10bb"
SRC_URI[sha256sum] = "bab39371d4ab972be1d539a8b10b6cc21f8eafc97f617102e667e82bd32eb234"
inherit autotools update-alternatives