patch to disable sysroot for cling in ROOT ebconfigs

rungitta · Oct 3, 2024 · 0707601 · 0707601
1 parent ef56e11
commit 0707601
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 4 deletions.
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-6.12.06_cling-runtime-sysroot.patch b/easybuild/easyconfigs/r/ROOT/ROOT-6.12.06_cling-runtime-sysroot.patch
@@ -0,0 +1,25 @@
+This patch disables the sysroot feature for cling. 
+
+Reusing existing patch found in Gentoo ebuild for ROOT, see url:
+https://github.com/gentoo/gentoo/blob/master/sci-physics/root/files/root-6.12.06_cling-runtime-sysroot.patch
+
+Patch needed for ROOT to build in EESSI:
+https://github.com/EESSI/software-layer/pull/769
+
+Index: root-6.12.06/interpreter/cling/lib/Utils/Paths.cpp
+===================================================================
+--- root-6.12.06.orig/interpreter/cling/lib/Utils/Paths.cpp
++++ root-6.12.06/interpreter/cling/lib/Utils/Paths.cpp
+@@ -57,11 +57,6 @@ using namespace clang;
+ void CopyIncludePaths(const clang::HeaderSearchOptions& Opts,
+                       llvm::SmallVectorImpl<std::string>& incpaths,
+                       bool withSystem, bool withFlags) {
+-  if (withFlags && Opts.Sysroot != "/") {
+-    incpaths.push_back("-isysroot");
+-    incpaths.push_back(Opts.Sysroot);
+-  }
+-
+   /// User specified include entries.
+   for (unsigned i = 0, e = Opts.UserEntries.size(); i != e; ++i) {
+     const HeaderSearchOptions::Entry &E = Opts.UserEntries[i];
+
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-6.24.06-foss-2021b.eb b/easybuild/easyconfigs/r/ROOT/ROOT-6.24.06-foss-2021b.eb
@@ -10,7 +10,13 @@ toolchainopts = {'pic': True}
 
 source_urls = ['https://root.cern.ch/download/']
 sources = ['%(namelower)s_v%(version)s.source.tar.gz']
-checksums = ['907f69f4baca1e4f30eeb4979598ca7599b6aa803ca046e80e25b6bbaa0ef522']
+patches = [
+    'ROOT-6.12.06_cling-runtime-sysroot.patch',
+]
+checksums = [
+    {'root_v6.24.06.source.tar.gz': '907f69f4baca1e4f30eeb4979598ca7599b6aa803ca046e80e25b6bbaa0ef522'},
+    {'ROOT-6.12.06_cling-runtime-sysroot.patch': '48cb39f51e5502f25bf3969fc3e27e4662d999df5d39667d0f779bdcb76ab57b'},
+]
 
 builddependencies = [
     ('CMake', '3.22.1'),

diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-6.26.06-foss-2022a.eb b/easybuild/easyconfigs/r/ROOT/ROOT-6.26.06-foss-2022a.eb
@@ -10,7 +10,13 @@ toolchainopts = {'pic': True}
 
 source_urls = ['https://root.cern.ch/download/']
 sources = ['%(namelower)s_v%(version)s.source.tar.gz']
-checksums = ['b1f73c976a580a5c56c8c8a0152582a1dfc560b4dd80e1b7545237b65e6c89cb']
+patches = [
+    'ROOT-6.12.06_cling-runtime-sysroot.patch',
+]
+checksums = [
+    {'root_v6.26.06.source.tar.gz': 'b1f73c976a580a5c56c8c8a0152582a1dfc560b4dd80e1b7545237b65e6c89cb'},
+    {'ROOT-6.12.06_cling-runtime-sysroot.patch': '48cb39f51e5502f25bf3969fc3e27e4662d999df5d39667d0f779bdcb76ab57b'},
+]
 
 builddependencies = [
     ('CMake', '3.23.1'),

diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-6.26.10-foss-2022b.eb b/easybuild/easyconfigs/r/ROOT/ROOT-6.26.10-foss-2022b.eb
@@ -10,7 +10,13 @@ toolchainopts = {'pic': True}
 
 source_urls = ['https://root.cern.ch/download/']
 sources = ['%(namelower)s_v%(version)s.source.tar.gz']
-checksums = ['8e56bec397104017aa54f9eb554de7a1a134474fe0b3bb0f43a70fc4fabd625f']
+patches = [
+    'ROOT-6.12.06_cling-runtime-sysroot.patch',
+]
+checksums = [
+    {'root_v6.26.10.source.tar.gz': '8e56bec397104017aa54f9eb554de7a1a134474fe0b3bb0f43a70fc4fabd625f'},
+    {'ROOT-6.12.06_cling-runtime-sysroot.patch': '48cb39f51e5502f25bf3969fc3e27e4662d999df5d39667d0f779bdcb76ab57b'},
+]
 
 builddependencies = [
     ('CMake', '3.24.3'),

diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-6.30.06-foss-2023a.eb b/easybuild/easyconfigs/r/ROOT/ROOT-6.30.06-foss-2023a.eb
@@ -10,7 +10,13 @@ toolchainopts = {'pic': True}
 
 source_urls = ['https://root.cern.ch/download/']
 sources = ['%(namelower)s_v%(version)s.source.tar.gz']
-checksums = ['300db7ed1b678ed2fb9635ca675921a1945c7c2103da840033b493091f55700c']
+patches = [
+    'ROOT-6.12.06_cling-runtime-sysroot.patch',
+]
+checksums = [
+    {'root_v6.30.06.source.tar.gz': '300db7ed1b678ed2fb9635ca675921a1945c7c2103da840033b493091f55700c'},
+    {'ROOT-6.12.06_cling-runtime-sysroot.patch': '48cb39f51e5502f25bf3969fc3e27e4662d999df5d39667d0f779bdcb76ab57b'},
+]
 
 builddependencies = [
     ('CMake', '3.26.3'),