diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-08 20:27:57 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-08 20:27:57 +0000 |
| commit | 258ebf824a542ff768f0b0bc030a0a2eb6076982 (patch) | |
| tree | 6c1dd2fda62cc9ffce9abe26e873b94b62ee411b /subr | |
| parent | b34508a69db1b444e20144f8a95445692c555f3b (diff) | |
| download | midipix_build-258ebf824a542ff768f0b0bc030a0a2eb6076982.tar.bz2 midipix_build-258ebf824a542ff768f0b0bc030a0a2eb6076982.tar.xz | |
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}.
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/pkg_build.subr | 3 | ||||
| -rw-r--r-- | subr/pkg_configure.subr | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/subr/pkg_build.subr b/subr/pkg_build.subr index 4c1b41eb..3f1fa270 100644 --- a/subr/pkg_build.subr +++ b/subr/pkg_build.subr @@ -19,9 +19,8 @@ pkg_build() { "${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}" \ "${PKG_LDFLAGS_BUILD:+LDFLAGS=${PKG_LDFLAGS_BUILD}}" \ "${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}"\ - "${PKG_PKGCONFIG:+PKGCONFIG=${PKG_PKGCONFIG}}" \ "${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \ - "${PKG_PKG_CONFIG_LIBPATH:+PKG_CONFIG_LIBPATH=${PKG_PKG_CONFIG_LIBPATH}}"\ + "${PKG_PKG_CONFIG_PATH:+PKG_CONFIG_PATH=${PKG_PKG_CONFIG_PATH}}"\ "LIBTOOL=${PKG_LIBTOOL:-slibtool}"; }; 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; }; |