From ec3649f757a4c114e14aa812d5c27f203e2a4807 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Wed, 1 May 2024 19:50:52 +0200
Subject: [PATCH 1/2] [14.0.x] Fix unittest link flags for extra micro-arch

---
 scram-project-build.file | 2 +-
 scram-tool-conf.file     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index 6d7c50e23c1..91543b30759 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -60,7 +60,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V09-02-14
+%define configtag       V09-02-15
 %endif
 
 %if "%{?buildarch:set}" != "set"
diff --git a/scram-tool-conf.file b/scram-tool-conf.file
index cdacd41fbbf..a7fc0433baa 100644
--- a/scram-tool-conf.file
+++ b/scram-tool-conf.file
@@ -39,6 +39,7 @@ for tool in %requiredtools; do
 done
 %{_sourcedir}/scram-tools/bin/get_tools "" "system" %i "systemtools"
 
+default_microarch_flag=$(%{cmsdist_directory}/vectorization/cmsdist_packages.py)
 for vec in %{package_vectorization}; do \
   ucvec=`echo $vec | tr '[a-z-]' '[A-Z_]'`
   for tool in %{vectorized_packages}; do \
@@ -49,7 +50,7 @@ for vec in %{package_vectorization}; do \
   done
   if [ -f %i/tools/selected/gcc-cxxcompiler.xml ] ; then
     f=$(%{cmsdist_directory}/vectorization/cmsdist_packages.py $vec)
-    sed -i -e "s#</tool>#    <flags CXXFLAGS_TARGETS_${ucvec}=\"${f}\"/>\n</tool>#" %i/tools/selected/gcc-cxxcompiler.xml
+    sed -i -e "s# *</tool>#    <flags CXXFLAGS_TARGETS_${ucvec}=\"${f}\"/>\n    <flags REM_CXXFLAGS_TARGETS_${ucvec}=\"${default_microarch_flag}\"/>\n  </tool>#" %i/tools/selected/gcc-cxxcompiler.xml
   fi
 done
 

From 515674b7098bf18cb12fb07de2bf112b8442b84c Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Thu, 2 May 2024 13:40:26 +0200
Subject: [PATCH 2/2] Update scram-project-build.file

---
 scram-project-build.file | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index 91543b30759..b3208dfdba9 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -60,7 +60,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V09-02-15
+%define configtag       V09-02-16
 %endif
 
 %if "%{?buildarch:set}" != "set"