diff options
Diffstat (limited to 'subr.pkg/pkg_install_make.subr')
| -rw-r--r-- | subr.pkg/pkg_install_make.subr | 83 |
1 files changed, 24 insertions, 59 deletions
diff --git a/subr.pkg/pkg_install_make.subr b/subr.pkg/pkg_install_make.subr index 89c61ce8..914a2af2 100644 --- a/subr.pkg/pkg_install_make.subr +++ b/subr.pkg/pkg_install_make.subr @@ -4,71 +4,36 @@ # pkg_install_make() { - local _pim_group_name="${1}" _pim_pkg_name="${2}" _pim_restart_at="${3}" - _pim_libtool="" _pim_rc=0 _pim_subdir=""; - - case "${PKG_LIBTOOL:-}" in - "") _pim_libtool=""; ;; - none) _pim_libtool=""; ;; - *) _pim_libtool="${PKG_LIBTOOL}"; ;; - esac; + local _pim_group_name="${1}" _pim_pkg_name="${2}" _pim_restart_at="${3}" \ + _pim_ranlib="" _pim_rc=0 _pim_subdir=""; for _pim_subdir in ${PKG_MAKE_SUBDIRS:-:}; do + if [ "${PKG_RANLIB_INSTALL:+1}" = 1 ]; then + _pim_ranlib="${PKG_RANLIB_INSTALL}"; + else + _pim_ranlib="${PKG_RANLIB}"; + fi; if [ "${_pim_subdir}" = ":" ]; then _pim_subdir=""; fi; - if [ "${#_pim_libtool}" -gt 0 ]; then - export MAKE="make LIBTOOL=${_pim_libtool}"; - fi; - - if [ "${PKG_MAKEFLAGS_INSTALL_LIST:+1}" = 1 ]; then - rtl_run_cmdlineV ":" "${PKG_MAKE}" \ - "${PKG_MAKEFLAGS_INSTALL_LIST}" \ - "${PKG_MAKEFLAGS_INSTALL_EXTRA_LIST:-}" \ - ${PKG_MAKEFLAGS_PARALLELISE:-} \ - AR="${PKG_AR}" \ - CC="${PKG_CC}" \ - RANLIB="${PKG_RANLIB}" \ - ${PKG_RANLIB_INSTALL:+"RANLIB=${PKG_RANLIB_INSTALL}"} \ - ${_pim_libtool:+"LIBTOOL=${_pim_libtool}"} \ - "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \ - "${PKG_INSTALL_TARGET:-install}" \ - ${_pim_subdir:+-C "${_pim_subdir}"}; - _pim_rc="${?}"; - elif [ "${PKG_MAKEFLAGS_INSTALL_EXTRA_LIST:+1}" = 1 ]; then - rtl_run_cmdlineV ":" "${PKG_MAKE}" \ - ${PKG_MAKEFLAGS_INSTALL:-} \ - "${PKG_MAKEFLAGS_INSTALL_EXTRA_LIST}" \ - ${PKG_MAKEFLAGS_PARALLELISE:-} \ - AR="${PKG_AR}" \ - CC="${PKG_CC}" \ - RANLIB="${PKG_RANLIB}" \ - ${PKG_RANLIB_INSTALL:+"RANLIB=${PKG_RANLIB_INSTALL}"} \ - ${_pim_libtool:+"LIBTOOL=${_pim_libtool}"} \ - "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \ - "${PKG_INSTALL_TARGET:-install}" \ - ${_pim_subdir:+-C "${_pim_subdir}"}; - _pim_rc="${?}"; - else - rtl_run_cmdlineV ":" "${PKG_MAKE}" \ - ${PKG_MAKEFLAGS_INSTALL:-} \ - ${PKG_MAKEFLAGS_INSTALL_EXTRA:-} \ - ${PKG_MAKEFLAGS_PARALLELISE:-} \ - AR="${PKG_AR}" \ - CC="${PKG_CC}" \ - RANLIB="${PKG_RANLIB}" \ - ${PKG_RANLIB_INSTALL:+"RANLIB=${PKG_RANLIB_INSTALL}"} \ - ${_pim_libtool:+"LIBTOOL=${_pim_libtool}"} \ - "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \ - "${PKG_INSTALL_TARGET:-install}" \ - ${_pim_subdir:+-C "${_pim_subdir}"}; - _pim_rc="${?}"; - fi; - - if [ "${#_pim_libtool}" -gt 0 ]; then - unset MAKE; - fi; + ex_pkg_run_make \ + "${PKG_AR}" "${PKG_CC}" "${PKG_CXX}" "${PKG_CCLD}" "${PKG_LIBTOOL}" \ + "${PKG_MAKE}" "${PKG_PKG_CONFIG}" "${_pim_ranlib}" \ + -- \ + 1 "${_pim_subdir}" \ + -- \ + "${PKG_MAKEFLAGS_INSTALL:-}" "${PKG_MAKEFLAGS_INSTALL_EXTRA:-}" \ + "${PKG_MAKEFLAGS_INSTALL_LIST:-}" "${PKG_MAKEFLAGS_INSTALL_EXTRA_LIST:-}" \ + "${PKG_MAKEFLAGS_LOADAVG:-}" "${PKG_MAKEFLAGS_PARALLELISE:-}" \ + "${PKG_MAKEFLAGS_VERBOSITY:-}" \ + -- \ + "" "" "" "" "" "" "" "" "" \ + -- \ + "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \ + "${PKG_INSTALL_TARGET:-install}" \ + ; + _pim_rc="${?}"; if [ "${_pim_rc}" -ne 0 ]; then return 1; |