From 5718ef533eb63f9d379d14b1f74508b2a5f43266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Tue, 28 Nov 2017 13:57:02 +0000 Subject: vars/build.vars: remove ${ENV_VARS_EXTRA} hacks in favour of ${PKG{,_}CONFIG}. subr/ex_pkg_env.subr: export ${PKG{,_}CONFIG} and ${PKG_CONFIG_LIBDIR} during non-host builds. --- subr/ex_pkg_env.subr | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'subr') diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index d3921e5f..853d785c 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -34,8 +34,11 @@ ex_pkg_env() { export CC="${PKG_TARGET}-gcc"; export CXX="${PKG_TARGET}-g++"; export RANLIB="${PKG_TARGET}-ranlib"; - [ -x "${PREFIX}/bin/${TARGET}-pkg-config" ]\ - && export PKG_CONFIG="${PREFIX}/bin/${TARGET}-pkg-config"; + if [ -x "${PREFIX}/bin/${TARGET}-pkg-config" ]; then + export PKGCONFIG="${PREFIX}/bin/${TARGET}-pkg-config"; + export PKG_CONFIG="${PREFIX}/bin/${TARGET}-pkg-config"; + export PKG_CONFIG_LIBDIR="${PKG_PREFIX}/lib/pkgconfig"; + fi; ;; esac; export LIBTOOL="${PKG_SLIBTOOL:-slibtool}"; -- cgit v1.2.3