From 702523207916e6a8a5394ff476ba309ea52bd2ae Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Mon, 9 Sep 2024 12:07:25 +0200
Subject: [PATCH] build-system: configurable build functions to use per
 module/variant

---
 Pmodules/libpbuild.bash | 26 +++------------------
 Pmodules/modbuild.in    | 50 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/Pmodules/libpbuild.bash b/Pmodules/libpbuild.bash
index b584851..6952a6a 100644
--- a/Pmodules/libpbuild.bash
+++ b/Pmodules/libpbuild.bash
@@ -1431,29 +1431,9 @@ _build_module() {
 				   [[ ${force_rebuild} == 'no' ]]; then
 				return 0
 			fi
-			local targets=()
-			targets+=( "${VERSIONS[@]/#/pbuild::pre_${target}_${system}_}" )
-			targets+=( "pbuild::pre_${target}_${system}" )
-			targets+=( "${VERSIONS[@]/#/pbuild::pre_${target}_${KernelName}_}" )
-			targets+=( "pbuild::pre_${target}_${KernelName}" )
-			targets+=( "${VERSIONS[@]/#/pbuild::pre_${target}_}" )
-			targets+=( "pbuild::pre_${target}" )
-
-			targets+=( "${VERSIONS[@]/#/pbuild::${target}_${system}_}" )
-			targets+=( "pbuild::${target}_${system}" )
-			targets+=( "${VERSIONS[@]/#/pbuild::${target}_${KernelName}_}" )
-			targets+=( "pbuild::${target}_${KernelName}" )
-			targets+=( "${VERSIONS[@]/#/pbuild::${target}_}" )
-			targets+=( "pbuild::${target}" )
-
-			targets+=( "${VERSIONS[@]/#/pbuild::post_${target}_${system}_}" )
-			targets+=( "pbuild::post_${target}_${system}" )
-			targets+=( "${VERSIONS[@]/#/pbuild::post_${target}_${KernelName}_}" )
-			targets+=( "pbuild::post_${target}_${KernelName}" )
-			targets+=( "${VERSIONS[@]/#/pbuild::post_${target}_}" )
-			targets+=( "pbuild::post_${target}" )
-
-			for t in "${targets[@]}"; do
+			debug "build functions for target ${target}: ${ModuleConfig[target_funcs:${target}]}"
+			local -- t=''
+			for t in ${ModuleConfig[target_funcs:${target}]}; do
 				# We cd into the dir before calling the function -
 				# just to be sure we are in the right directory.
 				#
diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in
index c93e007..858301b 100644
--- a/Pmodules/modbuild.in
+++ b/Pmodules/modbuild.in
@@ -521,6 +521,8 @@ declare -A Yaml_valid_keys_for_module=(
 
 declare -A Yaml_default_config=(
 	['build_requires']=''		# !!seq of strings
+	['build_functions']=''		# !!seq of strings
+	['build_variants']=''		# !!seq of strings
 	['compile_in_sourcetree']='no'  # !!str
 	['configure_with']='auto'	# !!str
 	['configure_args']=''           # !!seq of strings
@@ -663,6 +665,35 @@ build_modules_yaml_v1(){
 		local -- key=''
 		local -- value=''
 
+		get_build_functions(){
+			local -n yaml_in="$1"
+			local -a keys=()
+			for key in 'prep' 'configure' 'compile' 'install'; do
+				cfg[target_funcs:${key}]="pbuild::pre_${key} pbuild::${key} pbuild::post_${key}"
+			done
+			readarray -t keys < <( ${yq} -e ".|keys().[]" \
+						     <<<"${yaml_in}" \
+						     2>/dev/null ) || \
+				die_error_reading_keys "${yaml_input}"
+			local -- key=''
+			local -- _val=''
+			for key in "${keys[@]}"; do
+				case ${key} in
+					prep | configure | compile | install)
+						pm::get_seq "${yaml_in}" _val "${key}"
+						debug "${key} functions: ${_val}"
+						cfg[target_funcs:${key}]="${_val}"
+						;;
+					* )
+						die_invalid_key \
+							"${yaml_input}" \
+							'build functions' \
+							"${key}"
+						;;
+				esac
+			done
+		}
+
 		for key in "${!dfl[@]}"; do
 			cfg[${key}]="${dfl[${key}]}"
 		done
@@ -682,6 +713,25 @@ build_modules_yaml_v1(){
 					'configuration' \
 					"${key}"
 			case ${key} in
+				build_functions )
+					pm::get_value "${yaml_input}" value "${key}" '!!map'
+					get_build_functions value
+					;;
+				build_variants )
+					pm::get_value "${yaml_input}" value "${key}" '!!str'
+					case ${value,,} in
+						all ) : ;;
+						first_match ) : ;;
+						* )
+							die_invalid_value \
+								"${yaml_input}" \
+								'config section' \
+								"${key}" \
+								"${value}"
+							;;
+					esac
+					cfg[${key,,}]="${value}"
+					;;
 				compile_in_sourcetree )
 					pm::get_value "${yaml_input}" value "${key}" '!!bool'
 					case ${value,,} in