From 1dd016f3150117f7d7406e20c5ebb48eb406c2da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Tue, 6 Apr 2021 16:13:44 +0100
Subject: subr/build_init.subr:buildp_init_args(): check both automatic as well
 as non-automatic build groups. subr/ex_pkg.subr(:ex_pkg_load_vars(): return
 both automatic as well as non-automatic build groups.

---
 subr/ex_pkg.subr | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'subr/ex_pkg.subr')

diff --git a/subr/ex_pkg.subr b/subr/ex_pkg.subr
index e07d4dac..c1140d4a 100644
--- a/subr/ex_pkg.subr
+++ b/subr/ex_pkg.subr
@@ -133,10 +133,10 @@ ex_pkg_load_vars() {
 #
 # ex_pkg_load_groups() - load all available build groups
 #
-# Return:	zero (0) on success, non-zero (>0) on failure, build groups loaded and ${EX_PKG_BUILD_GROUPS} set post-return.
+# Return:	zero (0) on success, non-zero (>0) on failure, build groups loaded and ${EX_PKG_BUILD_GROUPS} and ${EX_PKG_BUILD_GROUPS_NOAUTO} set post-return.
 #
 ex_pkg_load_groups() {
-	local  _build_groups="" _fname="" _group="" _groups="";
+	local  _build_groups="" _build_groups_noauto="" _fname="" _group="" _groups="";
 	for _fname in $(find ./groups -name *.group | sort); do
 		rtl_fileop source_opt "${_fname}";
 		if [ -n "${GROUP_TARGET:-}" ]; then
@@ -149,6 +149,8 @@ ex_pkg_load_groups() {
 			if [ -n "${GROUP_AUTO:-}" ]; then
 				if [ "${GROUP_AUTO:-0}" -ne 0 ]; then
 					_build_groups="$(rtl_lconcat "${_build_groups}" "${_group}")";
+				else
+					_build_groups_noauto="$(rtl_lconcat "${_build_groups_noauto}" "${_group}")";
 				fi;
 				unset GROUP_AUTO;
 			else
@@ -157,6 +159,7 @@ ex_pkg_load_groups() {
 		fi;
 	done;
 	EX_PKG_BUILD_GROUPS="$(rtl_uniq "${_build_groups}")";
+	EX_PKG_BUILD_GROUPS_NOAUTO="$(rtl_uniq "${_build_groups_noauto}")";
 };
 
 #
-- 
cgit v1.2.3