diff options
| -rw-r--r-- | etc/README.md | 1 | ||||
| -rw-r--r-- | groups/010.host_deps.group | 1 | ||||
| -rw-r--r-- | groups/221.native_packages_dev.group | 1 | ||||
| -rw-r--r-- | midipix.env | 5 | ||||
| -rw-r--r-- | subr/pkg_build.subr | 7 |
5 files changed, 11 insertions, 4 deletions
diff --git a/etc/README.md b/etc/README.md index 12c19ab7..fe92f227 100644 --- a/etc/README.md +++ b/etc/README.md @@ -519,6 +519,7 @@ VERSION`` and/or ``URLS_GIT``, respectively. | MAKEFLAGS_BUILD_EXTRA | Additional list of ``make(1)`` flags during package ``make(1)``) build |
| MAKEFLAGS_INSTALL | List of ``make(1)`` flags during package ``make(1)``) installation |
| MAKEFLAGS_INSTALL_EXTRA | Additional list of ``make(1)`` flags during package ``make(1)``) installation |
+| MAKEFLAGS_VERBOSITY | Variable-value pair to pass to ``make(1)`` in order to force echo-back of command lines prior to execution |
| MAKE_INSTALL_VNAME | Variable name of ``make(1)`` installation destination directory variable during package ``make(1)``) installation |
| NO_CLEAN | Inhibit cleaning of package build directory beneath ``${PKG_BASE_DIR}`` pre-finish |
| NO_CLEAN_BASE_DIR | Inhibit cleaning of package build root directory beneath ``${BUILD_WORKDIR}`` |
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group index deb2ca32..153e9a1e 100644 --- a/groups/010.host_deps.group +++ b/groups/010.host_deps.group @@ -196,6 +196,7 @@ HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_RUBY_HOST_BUILD_STEPS_DISABLE:=configure_patch}; : ${PKG_RUBY_HOST_CFLAGS_CONFIGURE:="-g0 -O1 -DHAVE_RL_USERNAME_COMPLETION_FUNCTION=1"}; : ${PKG_RUBY_HOST_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-out-ext=fiddle,openssl"}; +: ${PKG_RUBY_HOST_MAKEFLAGS_VERBOSITY:="none"}; : ${PKG_SQLITE3_HOST_DEPENDS:="libreadline_host ncurses_host"}; : ${PKG_SQLITE3_HOST_SHA256SUM:=65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615}; : ${PKG_SQLITE3_HOST_VERSION:=3160200}; diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group index ea2c3892..09335394 100644 --- a/groups/221.native_packages_dev.group +++ b/groups/221.native_packages_dev.group @@ -112,6 +112,7 @@ patch patchutils perl python2 python3 ruby smallbasic tk")"; : ${PKG_RUBY_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_VERSION%.*}/ruby-${PKG_RUBY_VERSION}.tar.gz}; : ${PKG_RUBY_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-baseruby=${PREFIX}/bin/ruby --with-out-ext=fiddle,openssl"}; : ${PKG_RUBY_MAKEFLAGS_BUILD:=-j1}; +: ${PKG_RUBY_MAKEFLAGS_VERBOSITY:="none"}; : ${PKG_SMALLBASIC_URLS_GIT:="SmallBASIC=https://github.com/smallbasic/SmallBASIC@master"}; : ${PKG_SMALLBASIC_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99}; : ${PKG_SMALLBASIC_IN_TREE:=1}; diff --git a/midipix.env b/midipix.env index 8435428c..a00f8dad 100644 --- a/midipix.env +++ b/midipix.env @@ -25,8 +25,8 @@ DEFAULT_BUILD_VARS=" INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \ LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \ MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL \ - MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS \ - PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE \ + MAKEFLAGS_INSTALL_EXTRA MAKEFLAGS_VERBOSITY NO_CLEAN NO_CLEAN_BASE_DIR \ + NO_LOG_VARS PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE \ PREFIX RANLIB RPM_DISABLE SHA256SUM SUBDIR TARGET URL URLS_GIT \ VERSION"; @@ -114,6 +114,7 @@ DEFAULT_BUILD_VARS=" : ${DEFAULT_GITROOT_HEAD:=git://midipix.org}; : ${DEFAULT_MAKE_INSTALL_VNAME:=DESTDIR}; : ${DEFAULT_MAKEFLAGS_BUILD:=-j${DEFAULT_BUILD_CPUS}}; +: ${DEFAULT_MAKEFLAGS_VERBOSITY:="V=99"}; : ${DEFAULT_GIT_ARGS:=""}; : ${DEFAULT_TIMESTAMP_FMT:="%Y/%m/%d %H:%M:%S"}; : ${DEFAULT_WGET_ARGS:="--no-check-certificate"}; diff --git a/subr/pkg_build.subr b/subr/pkg_build.subr index 61b504ac..ecc049f6 100644 --- a/subr/pkg_build.subr +++ b/subr/pkg_build.subr @@ -3,12 +3,15 @@ # pkg_build() { - local _libtool="" _no_autoconf=""; + local _libtool="" _makeflags_verbosity="${PKG_MAKEFLAGS_VERBOSITY:-none}" _no_autoconf=""; case "${PKG_LIBTOOL:-}" in "") _libtool=""; ;; none) _libtool=""; ;; *) _libtool="${PKG_LIBTOOL}"; ;; esac; + if [ "${_makeflags_verbosity}" = "none" ]; then + _makeflags_verbosity=""; + fi; if [ ! -x "${PKG_CONFIGURE:-}" ]; then _no_autoconf=1; fi; @@ -30,7 +33,7 @@ pkg_build() { "${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \ "${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \ ${_libtool:+"LIBTOOL=${_libtool}"} \ - V=99; + ${_makeflags_verbosity}; }; # vim:filetype=sh |