From 515ac91d2d1ecffa2a24cbd4cef6d10c75260c49 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Mon, 5 Feb 2024 15:45:14 +0100
Subject: [PATCH] ROOT: Use rootcling instead of genreflex for root dict
 generation

---
 scram-project-build.file                 | 2 +-
 scram-tools.file/tools/root/env.sh       | 5 -----
 scram-tools.file/tools/root/root.xml     | 2 +-
 scram-tools.file/tools/root/rootrflx.xml | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index c5290e18eef..58ef8711a04 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -55,7 +55,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V09-02-03
+%define configtag       V09-02-04
 %endif
 
 %if "%{?buildarch:set}" != "set"
diff --git a/scram-tools.file/tools/root/env.sh b/scram-tools.file/tools/root/env.sh
index 5088c1aae52..f3c368c778f 100644
--- a/scram-tools.file/tools/root/env.sh
+++ b/scram-tools.file/tools/root/env.sh
@@ -1,8 +1,3 @@
 ROOT_GX11_LIB=GX11
 [ $(uname -s) = "Darwin" ] && ROOT_GX11_LIB=GCocoa
 export ROOT_GX11_LIB
-
-export GENREFLEX_FAILES_ON_WARNS=--fail_on_warnings
-if [ "$ROOT_CXXMODULES" = "1" ] ; then
-  export GENREFLEX_FAILES_ON_WARNS=-failOnWarnings
-fi
diff --git a/scram-tools.file/tools/root/root.xml b/scram-tools.file/tools/root/root.xml
index 68fa1edae6a..08e909c8ac3 100644
--- a/scram-tools.file/tools/root/root.xml
+++ b/scram-tools.file/tools/root/root.xml
@@ -1,6 +1,6 @@
 <tool name="root" version="@TOOL_VERSION@">
   <info url="http://root.cern.ch/root/"/>
   <use name="rootphysics"/>
-  <flags GENREFLEX_FAILES_ON_WARNS="@GENREFLEX_FAILES_ON_WARNS@"/>
+  <flags GENREFLEX_FAILES_ON_WARNS="-failOnWarnings"/>
   <flags CXXMODULES="@ROOT_CXXMODULES@"/>
 </tool>
diff --git a/scram-tools.file/tools/root/rootrflx.xml b/scram-tools.file/tools/root/rootrflx.xml
index 5c671802b90..ce11a10374e 100644
--- a/scram-tools.file/tools/root/rootrflx.xml
+++ b/scram-tools.file/tools/root/rootrflx.xml
@@ -7,7 +7,7 @@
     <flags GENREFLEX_GCCXMLOPT="-m64"/>
   </ifarchitecture>
   <flags GENREFLEX_CPPFLAGS="-DCMS_DICT_IMPL -D_REENTRANT -DGNUSOURCE -D__STRICT_ANSI__"/>
-  <runtime name="GENREFLEX" value="$ROOTRFLX_BASE/bin/genreflex"/>
+  <runtime name="GENREFLEX" value="$ROOTRFLX_BASE/bin/rootcling"/>
   <flags OVERRIDABLE_FLAGS="GENREFLEX_CPPFLAGS"/>
   <use name="root_interface"/>
   <use name="rootcling"/>