diff options
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/pkg_build.subr | 14 | ||||
| -rw-r--r-- | subr/pkg_configure.subr | 13 | ||||
| -rw-r--r-- | subr/pkg_install_make.subr | 14 |
3 files changed, 30 insertions, 11 deletions
diff --git a/subr/pkg_build.subr b/subr/pkg_build.subr index 327edae2..1c6712f7 100644 --- a/subr/pkg_build.subr +++ b/subr/pkg_build.subr @@ -3,7 +3,7 @@ # pkg_build() { - local _libtool="" _makeflags_verbosity="${PKG_MAKEFLAGS_VERBOSITY:-none}" _no_autoconf="" _subdir=""; + local _libtool="" _makeflags_verbosity="${PKG_MAKEFLAGS_VERBOSITY:-none}" _no_autoconf="" _rc=0 _subdir=""; case "${PKG_LIBTOOL:-}" in "") _libtool=""; ;; none) _libtool=""; ;; @@ -19,10 +19,13 @@ pkg_build() { if [ "${_subdir}" = ":" ]; then _subdir=""; fi; + if [ "${#_libtool}" -gt 0 ]; then + export MAKE="make LIBTOOL=${_libtool}"; + fi; # N.B. We only specify CC= here if the current package does not use GNU # autoconf as it often abuses it by appending -std={gnu99,...} to it # instead of amending CFLAGS. - rtl_run_cmd_unsplit make \ + rtl_run_cmd_unsplit "${PKG_MAKE}" \ ${PKG_MAKEFLAGS_BUILD:-} \ ${PKG_MAKEFLAGS_BUILD_EXTRA:-} \ "AR=${PKG_AR}" "${_no_autoconf:+CC=${PKG_CC}}" "RANLIB=${PKG_RANLIB}" \ @@ -38,8 +41,11 @@ pkg_build() { "${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \ ${_libtool:+"LIBTOOL=${_libtool}"} \ ${_makeflags_verbosity} \ - ${_subdir:+-C "${_subdir}"}; - if [ "${?}" -ne 0 ]; then + ${_subdir:+-C "${_subdir}"}; _rc="${?}"; + if [ "${#_libtool}" -gt 0 ]; then + unset MAKE; + fi; + if [ "${_rc}" -ne 0 ]; then return 1; fi; done; 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; }; diff --git a/subr/pkg_install_make.subr b/subr/pkg_install_make.subr index 2afcb7b8..f7ac4640 100644 --- a/subr/pkg_install_make.subr +++ b/subr/pkg_install_make.subr @@ -3,7 +3,7 @@ # pkg_install_make() { - local _libtool="" _subdir=""; + local _libtool="" _rc=0 _subdir=""; case "${PKG_LIBTOOL:-}" in "") _libtool=""; ;; none) _libtool=""; ;; @@ -13,7 +13,10 @@ pkg_install_make() { if [ "${_subdir}" = ":" ]; then _subdir=""; fi; - rtl_run_cmd_unsplit make \ + if [ "${#_libtool}" -gt 0 ]; then + export MAKE="make LIBTOOL=${_libtool}"; + fi; + rtl_run_cmd_unsplit "${PKG_MAKE}" \ ${PKG_MAKEFLAGS_INSTALL:-} \ ${PKG_MAKEFLAGS_INSTALL_EXTRA:-} \ AR="${PKG_AR}" CC="${PKG_CC}" RANLIB="${PKG_RANLIB}" \ @@ -21,8 +24,11 @@ pkg_install_make() { ${_libtool:+"LIBTOOL=${_libtool}"} \ "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \ ${PKG_INSTALL_TARGET:-install} \ - ${_subdir:+-C "${_subdir}"}; - if [ "${?}" -ne 0 ]; then + ${_subdir:+-C "${_subdir}"}; _rc="${?}"; + if [ "${#_libtool}" -gt 0 ]; then + unset MAKE; + fi; + if [ "${_rc}" -ne 0 ]; then return 1; fi; done; |