From ebda8bb2b1103bfe79ba7196832f4c0b2b5caffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Fri, 14 Feb 2020 13:00:38 +0000 Subject: build.sh: minor cleanup. groups/2*.native_packages_*.group: adds dependencies. subr/{build_init,ex_pkg_dispatch}.subr, etc/build.usage: forcibly rebuild all dependencies w/ -r **[ ...] vs. -r *[ ... ]. subr/ex_pkg_dispatch.subr:exp_pkg_get_packages(): log message before and after resolving dependencies. --- subr/build_init.subr | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'subr/build_init.subr') diff --git a/subr/build_init.subr b/subr/build_init.subr index 53327ace..c204c9b6 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -11,15 +11,18 @@ buildp_ast() { }; buildp_init_args() { - _status=""; + local _last_pkg=""; _status=""; if [ "${ARG_AS_NEEDED:-0}" -eq 1 ]\ && [ -e "${PREFIX}/build.gitref" ]\ && [ "$(git rev-parse HEAD)" = "$(cat "${PREFIX}/build.gitref")" ]; then _status="Git repository has not changed since last build and --as-needed was specified."; fi; - if [ -n "${ARG_RESTART}" ]\ - && [ "${ARG_RESTART#\*}" != "${ARG_RESTART}" ]; then - ARG_RESTART="${ARG_RESTART#\*}"; ARG_RESTART_RECURSIVE=1; + if [ -n "${ARG_RESTART}" ]; then + if [ "${ARG_RESTART#\*\*}" != "${ARG_RESTART}" ]; then + ARG_RESTART="${ARG_RESTART#\*\*}"; ARG_RESTART_RECURSIVE=2; + elif [ "${ARG_RESTART#\*}" != "${ARG_RESTART}" ]; then + ARG_RESTART="${ARG_RESTART#\*}"; ARG_RESTART_RECURSIVE=1; + fi; fi; case "${ARG_RESTART}" in ALL) ARG_RESTART_AT=ALL; ;; -- cgit v1.2.3