diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-04-10 16:31:58 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-04-10 16:31:58 +0100 |
| commit | 703f241c56199148e0acb3220c3f4a658ab24144 (patch) | |
| tree | 104b10b989a3b1fe6e10c3a05a55da67723efd31 /subr | |
| parent | 97b131f6725c1a9fe0c8050ffa7439bed3ef6c41 (diff) | |
| download | midipix_build-703f241c56199148e0acb3220c3f4a658ab24144.tar.bz2 midipix_build-703f241c56199148e0acb3220c3f4a658ab24144.tar.xz | |
Pass pkg-config(1) search path via ${PKG_CONFIG_LIBDIR}.
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/pkg_build.subr | 2 | ||||
| -rw-r--r-- | subr/pkg_configure.subr | 4 | ||||
| -rw-r--r-- | subr/pkg_configure_autotools.subr | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/subr/pkg_build.subr b/subr/pkg_build.subr index d1808213..eeb6ae54 100644 --- a/subr/pkg_build.subr +++ b/subr/pkg_build.subr @@ -28,7 +28,7 @@ pkg_build() { "${PKG_LDFLAGS_BUILD:+LDFLAGS=${PKG_LDFLAGS_BUILD}}" \ "${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}" \ "${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \ - "${PKG_PKG_CONFIG_PATH:+PKG_CONFIG_PATH=${PKG_PKG_CONFIG_PATH}}" \ + "${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \ ${_libtool:+"LIBTOOL=${_libtool}"}; }; diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index f2b64f92..39f5dbf0 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -7,7 +7,7 @@ pkg_configure() { if [ -x "${PKG_CONFIGURE:-}" ]; then rtl_export_vars \ PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ - PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH:-}" \ + PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}" \ PYTHON "${PKG_PYTHON:-}"; AR="${PKG_AR}" \ CC="${PKG_CC}" \ @@ -20,7 +20,7 @@ pkg_configure() { _rc="${?}" rtl_export_vars -u \ PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ - PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH:-}" \ + PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}" \ PYTHON "${PKG_PYTHON:-}"; return "${_rc}"; fi; diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr index 86a9dd39..c09f27a4 100644 --- a/subr/pkg_configure_autotools.subr +++ b/subr/pkg_configure_autotools.subr @@ -6,7 +6,7 @@ pkg_configure_autotools() { local _config_cache="" _fname="" _subdir_tgt=""; if rtl_exists_any "${PKG_BASE_DIR}/${PKG_SUBDIR}" \ "config.guess" "configure.ac" "configure.in" "configure"; - then rtl_export_vars PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH:-}"; + then rtl_export_vars PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}"; if [ "${PKG_FORCE_AUTORECONF:-0}" -eq 1 ]\ && ! (cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && autoreconf -fiv); then return 1; @@ -64,7 +64,7 @@ pkg_configure_autotools() { fi; fi; fi; - rtl_export_vars -u PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH:-}"; + rtl_export_vars -u PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}"; fi; }; |