diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-13 11:54:02 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-13 11:54:02 +0000 |
| commit | 8c791c79aef693feaa435016ec3f94ed808f5dd5 (patch) | |
| tree | c299e5ca2196770a9f787aa27c87971765baf111 /subr/ex_pkg_dispatch.subr | |
| parent | c3ef792f5258fbcb7313367f3ea5f9dc4613714d (diff) | |
| download | midipix_build-8c791c79aef693feaa435016ec3f94ed808f5dd5.tar.bz2 midipix_build-8c791c79aef693feaa435016ec3f94ed808f5dd5.tar.xz | |
build.sh: change working directory to "$(dirname "${0}")" at startup.
etc/build.usage: updated.
groups/2*.native_packages_*.group: adds dependencies.
vars/env.vars, groups/{010.host_deps,120.native_runtime}.group: removes ${PKG_SRC_TARBALL_DISABLE}.
groups/999.invariants.group b, vars/{env,invariants_tarballs}.vars: removes tarball generation.
subr/build_args.subr: reimplemented using getopts(1).
subr/{build_args,ex_pkg_dispatch}.subr: don't inhibit dependency processing if ${ARG_RESTART_RECURSIVE} is set.
Diffstat (limited to 'subr/ex_pkg_dispatch.subr')
| -rw-r--r-- | subr/ex_pkg_dispatch.subr | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr index 2a40e16c..7ea95875 100644 --- a/subr/ex_pkg_dispatch.subr +++ b/subr/ex_pkg_dispatch.subr @@ -9,7 +9,7 @@ exp_pkg_check_depends() { local _group_name="${1}" _pkg_depends="${2}" _pkg_name="${3}" _dependfl=0; if ! [ -n "${_restart}" ]\ - && ! [ "$(ex_rtl_get_var_unsafe "$(ex_rtl_toupper "${_group_name}")_IN_ORDER"))" = "1" ]; then + || [ "${ARG_RESTART_RECURSIVE:-0}" -eq 1 ]; then for _pkg_name_depend in ${_pkg_depends}; do if [ -n "$(ex_rtl_lsearch "${_pkgs_wait}" "${_pkg_name_depend}")" ]\ || [ -z "$(ex_rtl_lsearch "${_pkgs_complete}" "${_pkg_name_depend}")" ]; then @@ -89,7 +89,7 @@ exp_pkg_get_packages() { _pkg_names="$(ex_rtl_lsearch "${_pkg_names}" "${_restart}")"; fi; if ! [ -n "${_restart}" ]\ - && ! [ "$(ex_rtl_get_var_unsafe "${_group_name_uc}"_IN_ORDER)" = "1" ]; then + || [ "${ARG_RESTART_RECURSIVE:-0}" -eq 1 ]; then _pkg_names="$(ex_rtl_uniq $(exp_pkg_expand_packages ${_pkg_names}))"; fi; }; @@ -105,8 +105,7 @@ ex_pkg_dispatch() { for _pkg_name in ${_pkg_names}; do : $((_pkgs_count_max+=1)); done; - if [ "${ARG_PARALLEL:-0}" -gt 1 ]\ - && ! [ "$(ex_rtl_get_var_unsafe "$(ex_rtl_toupper "${_group_name}")"_IN_ORDER)" = 1 ]; then + if [ "${ARG_PARALLEL:-0}" -gt 1 ]; then _njobs_max="${DEFAULT_BUILD_CPUS}"; fi; ex_rtl_fileop mkfifo "${_pipe_path}"; exp_pkg_dispatch_group; |