From dd8dfb78f31c2371f7281441d364fa140b8ec5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Fri, 10 Apr 2020 15:55:34 +0100
Subject: subr/build_init.subr:buildp_init_args(): don't filter `host_deps_rpm'
 build group given either of --dump-{in,on-abort}.

---
 subr/build_init.subr | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'subr/build_init.subr')

diff --git a/subr/build_init.subr b/subr/build_init.subr
index e0b3bb75..436c45c5 100644
--- a/subr/build_init.subr
+++ b/subr/build_init.subr
@@ -44,7 +44,9 @@ buildp_init_args() {
 			esac;
 			if ! ex_pkg_load_groups; then
 				_rc=1; _status="Error: failed to load build groups.";
-			else	if ! rtl_lmatch "${ARG_DIST}" "rpm" ","; then
+			else	if ! rtl_lmatch "${ARG_DIST:-}" "rpm" ","\
+				&& [ -z "${ARG_DUMP_IN:-}" ]\
+				&& [ "${ARG_DUMP_ON_ABORT:-0}" -eq 0 ]; then
 					EX_PKG_BUILD_GROUPS="$(rtl_lfilter "${EX_PKG_BUILD_GROUPS}" "host_deps_rpm")";
 				fi;
 				if [ -z "${BUILD_GROUPS}" ]; then
@@ -143,7 +145,7 @@ buildp_init_files() {
 buildp_init_getopts() {
 	local _arg="" _opt="" _rc=0 _shiftfl=0 OPTIND=0; _status="";
 	: ${ARCH:="nt64"}; : ${BUILD:="debug"};
-	ARG_AS_NEEDED=0; ARG_CLEAN_BUILDS=""; ARG_DEBUG_MINIPIX=0; ARG_DIST=1; ARG_DUMP_IN="";
+	ARG_AS_NEEDED=0; ARG_CLEAN_BUILDS=""; ARG_DEBUG_MINIPIX=0; ARG_DIST=""; ARG_DUMP_IN="";
 	ARG_DUMP_ON_ABORT=0; ARG_FETCH_FORCE=0; ARG_PARALLEL=1; ARG_RELAXED=0; ARG_RESTART="";
 	ARG_RESTART_AT=""; ARG_RESTART_RECURSIVE=""; ARG_VERBOSE=0;
 	while [ "${#}" -gt 0 ]; do
-- 
cgit v1.2.3