From 7ab7cc8ac3dd32fd3db10f5d72ec2b15f0990c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Thu, 6 May 2021 11:01:05 +0100 Subject: patches/texinfo{,_host}-6.7.local.patch: added. midipix.env:${DEFAULT_{CROSS,HOST,NATIVE}_MAKE}: default to make. subr/pkg_{build,install}.subr: honour ${PKG_MAKE}. subr/pkg_build.subr: export "make LIBTOOL=${PKG_LIBTOOL}" during ${PKG_MAKE} if non-zero and not "none". subr/pkg_configure.subr: export "make LIBTOOL=${PKG_LIBTOOL}" during ${PKG_CONFIGURE} if non-zero and not "none". subr/pkg_install_make.subr: export "make LIBTOOL=${PKG_LIBTOOL}" during ${PKG_MAKE} if non-zero and not "none". --- subr/pkg_configure.subr | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'subr/pkg_configure.subr') diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index 39f5dbf0..c57b342b 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -3,12 +3,18 @@ # pkg_configure() { - local _rc=0; + local _libtool="" _rc=0; if [ -x "${PKG_CONFIGURE:-}" ]; then + case "${PKG_LIBTOOL:-}" in + "") _libtool=""; ;; + none) _libtool=""; ;; + *) _libtool="${PKG_LIBTOOL}"; ;; + esac; rtl_export_vars \ PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}" \ - PYTHON "${PKG_PYTHON:-}"; + PYTHON "${PKG_PYTHON:-}" \ + ${_libtool:+MAKE} ${_libtool:+"make LIBTOOL=${_libtool}"}; AR="${PKG_AR}" \ CC="${PKG_CC}" \ RANLIB="${PKG_RANLIB}" \ @@ -21,7 +27,8 @@ pkg_configure() { rtl_export_vars -u \ PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}" \ - PYTHON "${PKG_PYTHON:-}"; + PYTHON "${PKG_PYTHON:-}" \ + ${_libtool:+MAKE} ${_libtool:+"make LIBTOOL=${_libtool}"}; return "${_rc}"; fi; }; -- cgit v1.2.3