From 258ebf824a542ff768f0b0bc030a0a2eb6076982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sat, 8 Feb 2020 20:27:57 +0000 Subject: 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}. --- subr/pkg_configure.subr | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'subr/pkg_configure.subr') diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index e94810d6..de6fd494 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -4,14 +4,11 @@ pkg_configure() { if [ -x "${PKG_CONFIGURE}" ]; then - if [ -n "${PKG_PKGCONFIG}" ]; then - export PKGCONFIG="${PKG_PKGCONFIG}"; - fi; if [ -n "${PKG_PKG_CONFIG}" ]; then export PKG_CONFIG="${PKG_PKG_CONFIG}"; fi; - if [ -n "${PKG_PKG_CONFIG_LIB_PATH}" ]; then - export PKG_CONFIG_LIBPATH="${PKG_PKG_CONFIG_LIBPATH}"; + if [ -n "${PKG_PKG_CONFIG_PATH}" ]; then + export PKG_CONFIG_PATH="${PKG_PKG_CONFIG_PATH}"; fi; if [ -n "${PKG_PYTHON}" ]; then export PYTHON="${PKG_PYTHON}"; @@ -25,7 +22,7 @@ pkg_configure() { LDFLAGS="${PKG_LDFLAGS_CONFIGURE}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \ ${PKG_CONFIGURE} \ ${PKG_CONFIGURE_ARGS} ${PKG_CONFIGURE_ARGS_EXTRA} ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG}; - unset PKGCONFIG PKG_CONFIG PKG_CONFIG_LIBPATH PYTHON; + unset PKG_CONFIG PKG_CONFIG_PATH PYTHON; fi; }; -- cgit v1.2.3