From def55a0abe8c61b857c4bc021500bf52abd65a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sun, 9 Feb 2020 18:34:36 +0000 Subject: patches/{libcaca,toilet}_pre.local.patch: use $PKG_CONFIG vs. pkg-config. subr/pkg_configure_autotools.subr: export ${PKG_CONFIG{,_PATH}}. --- subr/pkg_configure_autotools.subr | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'subr/pkg_configure_autotools.subr') diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr index 4838717e..01f81ce5 100644 --- a/subr/pkg_configure_autotools.subr +++ b/subr/pkg_configure_autotools.subr @@ -8,6 +8,12 @@ pkg_configure_autotools() { -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" -o \ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.in" -o \ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/config.guess" ]; then + if [ -n "${PKG_PKG_CONFIG}" ]; then + export PKG_CONFIG="${PKG_PKG_CONFIG}"; + fi; + if [ -n "${PKG_PKG_CONFIG_PATH}" ]; then + export PKG_CONFIG_PATH="${PKG_PKG_CONFIG_PATH}"; + fi; if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" ]\ && [ ! -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" ]; then for _script_fname in bootstrap bootstrap.sh autogen.sh ""; do @@ -51,6 +57,7 @@ pkg_configure_autotools() { fi; sed -i"" "s,%PREFIX%,${PKG_PREFIX},g" "${PKG_BUILD_DIR}/config.cache"; fi; + unset PKG_CONFIG PKG_CONFIG_PATH; fi; }; -- cgit v1.2.3