From 41adfc08cdb17bcc80f3fca3584530dad675d57a Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 18 Nov 2021 18:37:04 +0100
Subject: [PATCH 1/3] root: build-script reviewed

---
 Compiler/root/build | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Compiler/root/build b/Compiler/root/build
index 4bdfe2a..8089bd6 100755
--- a/Compiler/root/build
+++ b/Compiler/root/build
@@ -21,6 +21,7 @@ pbuild::pre_configure_Darwin() {
 }
 
 pbuild::pre_configure_Linux() {
+	pbuild::use_cmake
 	if pbuild::use_flag 'oracleclient'; then
 		INSTANTCLIENT_INCLUDE_DIR='/usr/lib/oracle/12.1/client64/include'
 		INSTANTCLIENT_LIBRARY_DIR='/usr/lib/oracle/12.1/client64/lib'
@@ -34,11 +35,6 @@ pbuild::pre_configure_Linux() {
 		pbuild::add_configure_args "-DORACLE_PATH_LIB=${INSTANTCLIENT_LIBRARY_DIR}"
 		pbuild::add_configure_args "-DORACLE_OCI_VERSION=10G_R2"
 	fi
-}			   
-
-
-pbuild::post_configure() {
-	sed -i.bak "s:${MODULE_SRCDIR//\/\///}/root.exe:${MODULE_BUILDDIR//\/\///}/bin/root.exe:" CMakeFiles/hsimple.dir/build.make 
 }
 
 pbuild::compile() {

From 5f8ce25241b9edf66f9d22d7b383ac75da520606 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 18 Nov 2021 18:52:24 +0100
Subject: [PATCH 2/3] root: release stages reviewed

---
 Compiler/root/5/variants     | 12 ------------
 Compiler/root/6/variants     | 16 ----------------
 Compiler/root/files/variants | 13 +++++++++++++
 3 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 Compiler/root/5/variants
 delete mode 100644 Compiler/root/6/variants
 create mode 100644 Compiler/root/files/variants

diff --git a/Compiler/root/5/variants b/Compiler/root/5/variants
deleted file mode 100644
index 6c2b840..0000000
--- a/Compiler/root/5/variants
+++ /dev/null
@@ -1,12 +0,0 @@
-root/5.34.19         stable     gcc/4.7.4 
-root/5.34.19         stable     gcc/4.8.3 
-root/5.34.19         stable     gcc/4.8.4 
-root/5.34.19         stable     gcc/4.9.2 
-root/5.34.26         stable     gcc/4.7.4 
-root/5.34.26         stable     gcc/4.8.3 
-root/5.34.26         stable     gcc/4.8.4 
-root/5.34.26         stable     gcc/4.9.2 
-root/5.34.36         stable     gcc/4.8.5 
-root/5.34.36         stable     gcc/4.9.4 
-root/5.34.36         stable     gcc/5.3.0 
-root/5.34.36         stable     gcc/6.2.0 
diff --git a/Compiler/root/6/variants b/Compiler/root/6/variants
deleted file mode 100644
index c11624b..0000000
--- a/Compiler/root/6/variants
+++ /dev/null
@@ -1,16 +0,0 @@
-root/6.04.10         deprecated	gcc/4.9.2 b:psi-python27/2.3.0 
-root/6.04.10         deprecated	gcc/5.2.0 b:psi-python27/2.3.0 
-
-root/6.08.00         stable	gcc/4.8.5 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
-root/6.08.00         stable	gcc/4.9.4 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
-root/6.08.00         stable	gcc/5.4.0 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
-root/6.08.00         stable	gcc/6.2.0 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
-
-root/6.08.02    stable		gcc/4.8.5 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
-root/6.08.02    stable		gcc/4.9.4 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
-root/6.08.02    stable		gcc/5.4.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
-root/6.08.02    stable		gcc/6.2.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
-
-root/6.12.06	unstable	gcc/5.5.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
-root/6.12.06	unstable	gcc/6.4.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
-root/6.12.06	unstable	gcc/7.3.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
diff --git a/Compiler/root/files/variants b/Compiler/root/files/variants
new file mode 100644
index 0000000..ebbc6a9
--- /dev/null
+++ b/Compiler/root/files/variants
@@ -0,0 +1,13 @@
+root/5.34.19	stable		gcc/{4.7.4,4.8.3,4.8.4,4.9.2}
+root/5.34.26	stable		gcc/{4.7.4,4.8.3,4.8.4,4.9.2} 
+root/5.34.34	stable		gcc/4.8.3
+root/5.34.36	stable		gcc/{4.8.5,4.9.4}
+
+root/6.04.10	deprecated	gcc/{4.9.2,5.2.0} b:psi-python27/2.3.0 
+
+root/6.08.00	stable		gcc/{4.8.5,4.9.4,5.4.0,6.2.0} b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
+root/6.08.02    stable		gcc/{4.8.5,4.9.4,5.4.0,6.2.0} b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
+
+root/6.12.06	stable		gcc/7.3.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
+
+root/6.24.06	stable		gcc/10.3.0 b:Python/3.8.12 b:gsl/2.7 b:cmake/3.20.5 b:binutils/2.29

From 3a54d99d2b9c6e1453ab57c4bfecb15048ca57d3 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 18 Nov 2021 18:53:13 +0100
Subject: [PATCH 3/3] root: Oracle patch moved

---
 Compiler/root/files/cmake_oracle12.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 Compiler/root/files/cmake_oracle12.patch

diff --git a/Compiler/root/files/cmake_oracle12.patch b/Compiler/root/files/cmake_oracle12.patch
new file mode 100644
index 0000000..021e1ad
--- /dev/null
+++ b/Compiler/root/files/cmake_oracle12.patch
@@ -0,0 +1,12 @@
+diff -ur root-6.08.02.orig/cmake/modules/FindOracle.cmake root-6.08.02/cmake/modules/FindOracle.cmake
+--- root-6.08.02.orig/cmake/modules/FindOracle.cmake	2016-12-03 00:07:29.000000000 +0100
++++ root-6.08.02/cmake/modules/FindOracle.cmake	2017-03-30 15:40:50.682127137 +0200
+@@ -55,7 +55,7 @@
+ )
+ FIND_LIBRARY(
+     ORACLE_LIBRARY_LNNZ
+-    NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32
++    NAMES libnnz10 nnz10 libnnz11 nnz11 nnz12 ociw32
+     PATHS ${ORACLE_LIB_LOCATION}
+ )
+