From 487c40f31185b5bbcf3c1f278af2fe05150ac9d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Thu, 5 Mar 2020 13:43:03 +0000 Subject: subr/ex_pkg_dispatch.subr: implement *: inhibit group-group dependency expansion. etc/{build.usage,README.md}, subr/build_init.subr: updated. --- subr/ex_pkg_dispatch.subr | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'subr/ex_pkg_dispatch.subr') diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr index 5d7081c9..f0c0a2b6 100644 --- a/subr/ex_pkg_dispatch.subr +++ b/subr/ex_pkg_dispatch.subr @@ -150,6 +150,7 @@ exp_pkg_dispatch_packages() { # @_build_vars_default: list of default build variables # @_dispatch_fn: top-level dispatch function name # @_group_names: build group name(s) +# @_groups_inhibit_deps: inhibit group-group dependency expansion # @_njobs_max: maximum count of simultaneous jobs # @_pipe_path: pathname to build FIFO # @_restart: optional whitespace-separated list of package names to rebuild @@ -161,13 +162,16 @@ exp_pkg_dispatch_packages() { # ex_pkg_dispatch() { local _build_steps_default="${1}" _build_vars_default="${2}" _dispatch_fn="${3}" \ - _group_names="${4}" _njobs_max="${5}" _pipe_path="${6}" _restart="${7}" \ - _restart_at="${8}" _restart_recursive="${9}" _workdir="${10}" \ + _group_names="${4}" _groups_inhibit_deps="${5}" _njobs_max="${6}" _pipe_path="${7}" \ + _restart="${8}" _restart_at="${9}" _restart_recursive="${10}" _workdir="${11}" \ _pkg_name="" _pkg_names="" _rc=0 \ EXP_PKG_COMPLETE EXP_PKG_DISABLED EXP_PKG_FINISHED EXP_PKG_DISPATCH_COUNT \ EXP_PKG_DISPATCH_COUNT_MAX EXP_PKG_DISPATCH_NJOBS EXP_PKG_NAMES; EX_PKG_DISPATCH_WAIT=""; - for _group_name in $(rtl_uniq $(rtl_lunfold_depends '${_name}_GROUP_DEPENDS' ${_group_names})); do + if [ "${_groups_inhibit_deps:-0}" -eq 0 ]; then + _group_names="$(rtl_uniq $(rtl_lunfold_depends '${_name}_GROUP_DEPENDS' ${_group_names}))"; + fi; + for _group_name in ${_group_names}; do EXP_PKG_COMPLETE="" EXP_PKG_DISABLED="" EXP_PKG_FINISHED=""; EXP_PKG_DISPATCH_COUNT=0 EXP_PKG_DISPATCH_COUNT_MAX=0 EXP_PKG_DISPATCH_NJOBS=0; EXP_PKG_NAMES="" EX_PKG_DISPATCH_WAIT=""; -- cgit v1.2.3