From 2f75770abad7cdd1b3b23ad28dbc60292bd4d65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sat, 29 Feb 2020 01:24:42 +0000 Subject: groups/dev_packages.group:${GROUP_AUTO}: set to 0. subr/build_init.subr:buildp_init_vars(): don't include groups in ${_default_build_groups} if ${GROUP_AUTO} is set to 0. --- subr/build_init.subr | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'subr/build_init.subr') diff --git a/subr/build_init.subr b/subr/build_init.subr index 321678a5..27af80da 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -212,7 +212,14 @@ buildp_init_vars() { else _fname="${_fname##*/}"; _fname="${_fname%.group}"; _target="${_fname#*.}"; fi; - _default_build_groups="$(rtl_lconcat "${_default_build_groups}" "${_target}")"; + if [ -n "${GROUP_AUTO}" ]; then + if [ "${GROUP_AUTO:-0}" -ne 0 ]; then + _default_build_groups="$(rtl_lconcat "${_default_build_groups}" "${_target}")"; + fi; + unset GROUP_AUTO; + else + _default_build_groups="$(rtl_lconcat "${_default_build_groups}" "${_target}")"; + fi; done; _default_build_groups="$(rtl_uniq "${_default_build_groups}")"; if ! rtl_lmatch "${ARG_DIST}" "rpm" ","; then -- cgit v1.2.3