diff options
Diffstat (limited to 'subr.pkg/pkg_build.subr')
| -rw-r--r-- | subr.pkg/pkg_build.subr | 114 |
1 files changed, 25 insertions, 89 deletions
diff --git a/subr.pkg/pkg_build.subr b/subr.pkg/pkg_build.subr index 6eae1093..a11e87ac 100644 --- a/subr.pkg/pkg_build.subr +++ b/subr.pkg/pkg_build.subr @@ -5,20 +5,9 @@ pkg_build() { local _pb_group_name="${1}" _pb_pkg_name="${2}" _pb_restart_at="${3}" \ - _pb_libtool="" _pb_makeflags_verbosity="" _pb_no_autoconf="" \ - _pb_rc=0 _pb_subdir=""; - _pb_makeflags_verbosity="${PKG_MAKEFLAGS_VERBOSITY:-none}"; - if [ "${_pb_makeflags_verbosity}" = "none" ]; then - _pb_makeflags_verbosity=""; - fi; - - case "${PKG_LIBTOOL:-}" in - "") _pb_libtool=""; ;; - none) _pb_libtool=""; ;; - *) _pb_libtool="${PKG_LIBTOOL}"; ;; - esac; + _pb_no_autoconf="" _pb_rc=0 _pb_subdir=""; - if [ ! -x "${PKG_CONFIGURE:-}" ]; then + if ! [ -x "${PKG_CONFIGURE:-}" ]; then _pb_no_autoconf=1; fi; @@ -27,84 +16,31 @@ pkg_build() { _pb_subdir=""; fi; - if [ "${#_pb_libtool}" -gt 0 ]; then - export MAKE="make LIBTOOL=${_pb_libtool}"; - fi; - - # N.B. We only specify CC= here if the current package does not use GNU + # + # N.B. We only pass 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. - if [ "${PKG_MAKEFLAGS_BUILD_LIST:+1}" = 1 ]; then - rtl_run_cmdlineV ":" "${PKG_MAKE}" \ - "AR=${PKG_AR}" \ - "${_pb_no_autoconf:+CC=${PKG_CC}}" \ - "RANLIB=${PKG_RANLIB}" \ - "${PKG_MAKEFLAGS_BUILD_LIST}" \ - "${PKG_MAKEFLAGS_BUILD_EXTRA_LIST:-}" \ - ${PKG_MAKEFLAGS_PARALLELISE:-} \ - "${PKG_CFLAGS_BUILD:+CFLAGS=${PKG_CFLAGS_BUILD}}" \ - "${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}" \ - "${PKG_CPPFLAGS_BUILD:+CPPFLAGS=${PKG_CPPFLAGS_BUILD}}" \ - "${PKG_CPPFLAGS_BUILD_EXTRA:+CPPFLAGS+=${PKG_CPPFLAGS_BUILD_EXTRA}}" \ - "${PKG_CXXFLAGS_BUILD:+CXXFLAGS=${PKG_CXXFLAGS_BUILD}}" \ - "${PKG_CXXFLAGS_BUILD_EXTRA:+CXXFLAGS+=${PKG_CXXFLAGS_BUILD_EXTRA}}" \ - "${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_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \ - ${_pb_libtool:+"LIBTOOL=${_pb_libtool}"} \ - ${_pb_makeflags_verbosity} \ - ${_pb_subdir:+-C "${_pb_subdir}"}; - _pb_rc="${?}"; - elif [ "${PKG_MAKEFLAGS_BUILD_EXTRA_LIST:+1}" = 1 ]; then - rtl_run_cmdlineV ":" "${PKG_MAKE}" \ - "AR=${PKG_AR}" \ - "${_pb_no_autoconf:+CC=${PKG_CC}}" \ - "RANLIB=${PKG_RANLIB}" \ - ${PKG_MAKEFLAGS_BUILD:-} \ - "${PKG_MAKEFLAGS_BUILD_EXTRA_LIST}" \ - ${PKG_MAKEFLAGS_PARALLELISE:-} \ - "${PKG_CFLAGS_BUILD:+CFLAGS=${PKG_CFLAGS_BUILD}}" \ - "${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}" \ - "${PKG_CPPFLAGS_BUILD:+CPPFLAGS=${PKG_CPPFLAGS_BUILD}}" \ - "${PKG_CPPFLAGS_BUILD_EXTRA:+CPPFLAGS+=${PKG_CPPFLAGS_BUILD_EXTRA}}" \ - "${PKG_CXXFLAGS_BUILD:+CXXFLAGS=${PKG_CXXFLAGS_BUILD}}" \ - "${PKG_CXXFLAGS_BUILD_EXTRA:+CXXFLAGS+=${PKG_CXXFLAGS_BUILD_EXTRA}}" \ - "${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_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \ - ${_pb_libtool:+"LIBTOOL=${_pb_libtool}"} \ - ${_pb_makeflags_verbosity} \ - ${_pb_subdir:+-C "${_pb_subdir}"}; - _pb_rc="${?}"; - else - rtl_run_cmdlineV ":" "${PKG_MAKE}" \ - "AR=${PKG_AR}" \ - "${_pb_no_autoconf:+CC=${PKG_CC}}" \ - "RANLIB=${PKG_RANLIB}" \ - ${PKG_MAKEFLAGS_BUILD:-} \ - ${PKG_MAKEFLAGS_BUILD_EXTRA:-} \ - ${PKG_MAKEFLAGS_PARALLELISE:-} \ - "${PKG_CFLAGS_BUILD:+CFLAGS=${PKG_CFLAGS_BUILD}}" \ - "${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}" \ - "${PKG_CPPFLAGS_BUILD:+CPPFLAGS=${PKG_CPPFLAGS_BUILD}}" \ - "${PKG_CPPFLAGS_BUILD_EXTRA:+CPPFLAGS+=${PKG_CPPFLAGS_BUILD_EXTRA}}" \ - "${PKG_CXXFLAGS_BUILD:+CXXFLAGS=${PKG_CXXFLAGS_BUILD}}" \ - "${PKG_CXXFLAGS_BUILD_EXTRA:+CXXFLAGS+=${PKG_CXXFLAGS_BUILD_EXTRA}}" \ - "${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_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \ - ${_pb_libtool:+"LIBTOOL=${_pb_libtool}"} \ - ${_pb_makeflags_verbosity} \ - ${_pb_subdir:+-C "${_pb_subdir}"}; - _pb_rc="${?}"; - fi; - - if [ "${#_pb_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}" "${PKG_RANLIB}" \ + -- \ + "${_pb_no_autoconf}" "${_pb_subdir}" \ + -- \ + "${PKG_MAKEFLAGS_BUILD:-}" "${PKG_MAKEFLAGS_BUILD_EXTRA:-}" \ + "${PKG_MAKEFLAGS_BUILD_LIST:-}" "${PKG_MAKEFLAGS_BUILD_EXTRA_LIST:-}" \ + "${PKG_MAKEFLAGS_LOADAVG:-}" "${PKG_MAKEFLAGS_PARALLELISE:-}" \ + "${PKG_MAKEFLAGS_VERBOSITY:-}" \ + -- \ + "${PKG_CFLAGS_BUILD:-}" "${PKG_CFLAGS_BUILD_EXTRA:-}" \ + "${PKG_CPPFLAGS_BUILD:-}" "${PKG_CPPFLAGS_BUILD_EXTRA:-}" \ + "${PKG_CXXFLAGS_BUILD:-}" "${PKG_CXXFLAGS_BUILD_EXTRA:-}" \ + "${PKG_LDFLAGS_BUILD:-}" "${PKG_LDFLAGS_BUILD_EXTRA:-}" \ + "${PKG_PKG_CONFIG_LIBDIR:-}" \ + -- \ + "" "" \ + ; + _pb_rc="${?}"; if [ "${_pb_rc}" -ne 0 ]; then break; |