subr/pkg_{build,configure}.subr: {pass,export} ${PKG_CONFIG{,_PATH}}.

vars/build.vars:{rpm,dbus{,_glib}}_host:${PKG_ENV_VARS_EXTRA}: remove obsolete ${PKG_CONFIG_PATH} export.
vars/env.vars:${DEFAULT_BUILD_VARS}: remove ${PKG_CONFIG_LIBDIR,PKGCONFIG}.
vars/midipix.vars: provide ${DEFAULT_HOST_PKG_CONFIG{,_PATH}}, fix typo in ${DEFAULT_NATIVE_PKG_CONFIG_PATH}.

3 files changed, 16 insertions, 17 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 30786223..1aa48a50 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -239,7 +239,6 @@ HOST_TOOLS_RPM_PREFIX="${PREFIX}";
 : ${PKG_RPM_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
 : ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="-without-lua --enable-ndb --enable-lmdb --enable-bdb=no --with-crypto=openssl --with-vendor=midipix"};
 : ${PKG_RPM_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"};
-: ${PKG_RPM_HOST_ENV_VARS_EXTRA:="PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig"};
 
 #
 # Build target host_toolchain_deps
@@ -634,7 +633,6 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_DBUS_HOST_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_HOST_VERSION}.tar.gz};
 : ${PKG_DBUS_HOST_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa};
 : ${PKG_DBUS_HOST_CONFIGURE_ARGS_EXTRA:="--disable-tests --with-dbus-daemondir=/bin"};
-: ${PKG_DBUS_HOST_ENV_VARS_EXTRA:="PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig"};
 : ${PKG_INFOUNZIP_HOST_URLS_GIT:=infounzip-host=https://github.com/Redfoxmoon3/infounzip.git@master};
 : ${PKG_INFOUNZIP_HOST_IN_TREE:=1};
 : ${PKG_INFOZIP_HOST_URLS_GIT:=infozip-host=https://github.com/Redfoxmoon3/infozip.git@master};
@@ -668,7 +666,6 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_DBUS_GLIB_HOST_VERSION:=0.110};
 : ${PKG_DBUS_GLIB_HOST_URL:=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PKG_DBUS_GLIB_HOST_VERSION}.tar.gz};
 : ${PKG_DBUS_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--enable-bash-completion=no"};
-: ${PKG_DBUS_GLIB_HOST_ENV_VARS_EXTRA:="PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig"};
 : ${PKG_GPERF_HOST_SHA256SUM:=588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2};
 : ${PKG_GPERF_HOST_VERSION:=3.1};
 : ${PKG_GPERF_HOST_URL:=https://ftp.gnu.org/gnu/gperf/gperf-${PKG_GPERF_HOST_VERSION}.tar.gz};
diff --git a/vars/env.vars b/vars/env.vars
index 928f7bbd..b3aadf91 100644
--- a/vars/env.vars
+++ b/vars/env.vars
@@ -5,18 +5,19 @@ DEFAULT_BUILD_STEPS="
 	install_subdirs install_make install_files install_libs					\
 	install_pkgconfig install_purge_la install_strip install install_rpm clean";
 DEFAULT_BUILD_VARS="
-	AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CC					\
-	CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA				\
-	CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIG_CACHE_LOCAL CONFIGURE	\
-	CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXX CXXFLAGS_CONFIGURE_EXTRA DEPS_BASE		\
-	DEPS_PARENT DESTDIR DISABLED ENV_VARS_EXTRA FNAME GITROOT INHERIT_FROM INSTALL_FILES	\
-	INSTALL_FILES INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET		\
-	INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE			\
-	LDFLAGS_CONFIGURE_EXTRA	LDFLAGS_INSTALL_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME		\
-	MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA		\
-	NO_CLEAN_BASE_DIR NO_LOG_VARS PYTHON PARALLELISE PATCHES_EXTRA PKG_CONFIG		\
-	PKG_CONFIG_LIBDIR PKGCONFIG PKGLIST_DISABLE PREFIX RANLIB RPM_DISABLE SHA256SUM		\
-	SRC_TARBALL_DISABLE SUBDIR TARGET URL URL_TYPE URLS_GIT VERSION";
+	AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CC CFLAGS_BUILD_EXTRA		\
+	CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIG_CACHE		\
+	CONFIG_CACHE_EXTRA CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS				\
+	CONFIGURE_ARGS_EXTRA CXX CXXFLAGS_CONFIGURE_EXTRA DEPS_BASE DEPS_PARENT			\
+	DESTDIR DISABLED ENV_VARS_EXTRA FNAME GITROOT INHERIT_FROM INSTALL_FILES		\
+	INSTALL_FILES INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA				\
+	INSTALL_TARGET INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA				\
+	LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA  LDFLAGS_INSTALL_EXTRA			\
+	LIBTOOL MAKE MAKE_INSTALL_VNAME MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA			\
+	MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN_BASE_DIR NO_LOG_VARS			\
+	PYTHON PARALLELISE PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_PATH PKGLIST_DISABLE		\
+	PREFIX RANLIB RPM_DISABLE SHA256SUM SRC_TARBALL_DISABLE SUBDIR TARGET URL		\
+	URL_TYPE URLS_GIT VERSION";
 DEFAULT_LOG_MSG_FAIL_COLOUR=91;
 DEFAULT_LOG_MSG_INFO_COLOUR=93;
 DEFAULT_LOG_MSG_INF2_COLOUR=33;
diff --git a/vars/midipix.vars b/vars/midipix.vars
index 7a779d57..74beec5c 100644
--- a/vars/midipix.vars
+++ b/vars/midipix.vars
@@ -75,15 +75,16 @@
 : ${DEFAULT_HOST_CXX:=g++};
 : ${DEFAULT_HOST_LIBTOOL:=slibtool};
 : ${DEFAULT_HOST_MAKE:=make LIBTOOL=slibtool};
+: ${DEFAULT_HOST_PKG_CONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config};
+: ${DEFAULT_HOST_PKG_CONFIG_PATH:=${PREFIX}/lib/pkgconfig};
 : ${DEFAULT_HOST_RANLIB:=ranlib};
 : ${DEFAULT_NATIVE_AR:=${DEFAULT_TARGET}-ar};
 : ${DEFAULT_NATIVE_CC:=${DEFAULT_TARGET}-gcc};
 : ${DEFAULT_NATIVE_CXX:=${DEFAULT_TARGET}-g++};
 : ${DEFAULT_NATIVE_LIBTOOL:=slibtool};
 : ${DEFAULT_NATIVE_MAKE:=make LIBTOOL=slibtool};
-: ${DEFAULT_NATIVE_PKGCONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config};
 : ${DEFAULT_NATIVE_PKG_CONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config};
-: ${DEFAULT_NATIVE_PKG_CONFIG_LIBDIR:=${PREFIX_NATIVE}/lib/pkgconfig};
+: ${DEFAULT_NATIVE_PKG_CONFIG_PATH:=${PREFIX}/lib/pkgconfig};
 : ${DEFAULT_NATIVE_RANLIB:=${DEFAULT_TARGET}-ranlib};
 
 # Build {log,status} & tarball names