From 703f241c56199148e0acb3220c3f4a658ab24144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Fri, 10 Apr 2020 16:31:58 +0100
Subject: Pass pkg-config(1) search path via ${PKG_CONFIG_LIBDIR}.

---
 groups/100.native_tools.group        | 2 +-
 groups/200.native_packages.group     | 2 +-
 groups/251.native_packages_lib.group | 5 +++--
 groups/800.minipix.group             | 2 +-
 groups/dev_packages.group            | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'groups')

diff --git a/groups/100.native_tools.group b/groups/100.native_tools.group
index 8dfc9a2a..30ac1cc3 100644
--- a/groups/100.native_tools.group
+++ b/groups/100.native_tools.group
@@ -6,7 +6,7 @@ NATIVE_TOOLS_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools";
 NATIVE_TOOLS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_TOOLS_PACKAGES="
 mdso perk pkgconf slibtool";
-NATIVE_TOOLS_PKG_CONFIG_PATH="${PREFIX_NATIVE}/lib/pkgconfig";
+NATIVE_TOOLS_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig";
 NATIVE_TOOLS_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MDSO_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
 : ${PKG_MDSO_CONFIGURE_ARGS:="--prefix= --target=${DEFAULT_TARGET}"};
diff --git a/groups/200.native_packages.group b/groups/200.native_packages.group
index 1f677d52..886fab53 100644
--- a/groups/200.native_packages.group
+++ b/groups/200.native_packages.group
@@ -9,7 +9,7 @@ NATIVE_PACKAGES_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools
 NATIVE_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_PACKAGES="";
-NATIVE_PACKAGES_PKG_CONFIG_PATH="${PREFIX_NATIVE}/lib/pkgconfig";
+NATIVE_PACKAGES_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig";
 NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python2";
 
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index ac86b9c2..6eb33246 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -14,10 +14,11 @@ libxslt libz libzip")";
 : ${PKG_GLIB_VERSION:=2.54.0};
 : ${PKG_GLIB_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_VERSION%.[0-9]}/glib-${PKG_GLIB_VERSION}.tar.xz};
 : ${PKG_GLIB_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount --with-python=${PREFIX}/bin/python3"};
-: ${PKG_LIBARCHIVE_SHA256SUM:=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e};
-: ${PKG_LIBARCHIVE_VERSION:=3.3.3};
+: ${PKG_LIBARCHIVE_SHA256SUM:=b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176};
+: ${PKG_LIBARCHIVE_VERSION:=3.4.2};
 : ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz};
 : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
+: ${PKG_LIBARCHIVE_LIBTOOL:="libtool"};
 : ${PKG_LIBASR_SHA256SUM:=9cd88e0172e6d426438875e09229d1d473d56db546d02b630f9dd14db226d68d};
 : ${PKG_LIBASR_VERSION:=1.0.3};
 : ${PKG_LIBASR_URL:=https://www.opensmtpd.org/archives/libasr-${PKG_LIBASR_VERSION}.tar.gz};
diff --git a/groups/800.minipix.group b/groups/800.minipix.group
index 8600c01d..ac2c59e2 100644
--- a/groups/800.minipix.group
+++ b/groups/800.minipix.group
@@ -16,7 +16,7 @@ gdb_minipix grep_minipix gzip_minipix infounzip_minipix infozip_minipix
 less_minipix nano_minipix patch_minipix python2_minipix sed_minipix
 tar_minipix vim_minipix wget_minipix which_minipix xz_minipix
 mintty_minipix ntctty_minipix ntux_minipix perk_minipix ptycon_minipix";
-MINIPIX_PKG_CONFIG_PATH="${PREFIX_NATIVE}/lib/pkgconfig";
+MINIPIX_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig";
 MINIPIX_PKGLIST_DISABLE=1;
 MINIPIX_PREFIX="${PREFIX}/minipix_dist";
 MINIPIX_RPM_DISABLE=1;
diff --git a/groups/dev_packages.group b/groups/dev_packages.group
index 83c20977..4446a7f3 100644
--- a/groups/dev_packages.group
+++ b/groups/dev_packages.group
@@ -11,7 +11,7 @@ DEV_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 DEV_PACKAGES_PACKAGES="
 ncurses ncursesw coreutils bash libz git make sed grep findutils m4 flex bison
 diffutils patch patchutils gzip tar dos2unix nano vim";
-DEV_PACKAGES_PKG_CONFIG_PATH="${PREFIX_NATIVE}/lib/pkgconfig";
+DEV_PACKAGES_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig";
 DEV_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 DEV_PACKAGES_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_NCURSES_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
-- 
cgit v1.2.3