diff options
author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-28 13:57:02 +0000 |
---|---|---|
committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-28 13:57:02 +0000 |
commit | 5718ef533eb63f9d379d14b1f74508b2a5f43266 (patch) | |
tree | 012e967e032ce2d43f6bee10e4a1830a18366b30 /subr | |
parent | 11966ccc920d85a67ab6132ac52d419bf57a2b71 (diff) | |
download | midipix_build-5718ef533eb63f9d379d14b1f74508b2a5f43266.tar.bz2 midipix_build-5718ef533eb63f9d379d14b1f74508b2a5f43266.tar.xz |
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.
Diffstat (limited to 'subr')
-rw-r--r-- | subr/ex_pkg_env.subr | 7 |
1 files changed, 5 insertions, 2 deletions
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}"; |