[gaudi] v35r0 (#19878)

* [gaudi] v35r0

* [gaudi] format

* [gaudi] comments from #19878

2 files changed, 23 insertions, 27 deletions

diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py
index afacac8d32..2062cf647f 100644
--- a/var/spack/repos/builtin/packages/gaudi/package.py
+++ b/var/spack/repos/builtin/packages/gaudi/package.py
@@ -14,8 +14,7 @@ class Gaudi(CMakePackage):
     url      = "https://gitlab.cern.ch/gaudi/Gaudi/-/archive/v33r1/Gaudi-v33r1.tar.gz"
 
     version('master', branch='master')
-    # major cmake config overhaul already in use by some
-    version('develop', git='https://gitlab.cern.ch/clemenci/Gaudi.git', branch='cmake-modernisation')
+    version('35.0', sha256='c01b822f9592a7bf875b9997cbeb3c94dea97cb13d523c12649dbbf5d69b5fa6')
     version('34.0', sha256='28fc4abb5a6b08da5a6b1300451c7e8487f918b055939877219d454abf7668ae')
     version('33.2', sha256='26aaf9c4ff237a60ec79af9bd18ad249fc91c16e297ba77e28e4a256123db6e5')
     version('33.1', sha256='7eb6b2af64aeb965228d4b6ea66c7f9f57f832f93d5b8ad55c9105235af5b042')
@@ -35,8 +34,6 @@ class Gaudi(CMakePackage):
 
     # only build subdirectory GaudiExamples when +optional
     patch("build_testing.patch", when="@:34.99")
-    # fix for the new cmake config, should be merged in branch
-    patch('python2.patch', when="@develop")
     # fixes for the cmake config which could not find newer boost versions
     patch("link_target_fixes.patch", when="@33.0:34.99")
     patch("link_target_fixes32.patch", when="@:32.2")
@@ -50,8 +47,9 @@ class Gaudi(CMakePackage):
     depends_on('fmt', when='@33.2:')
     depends_on('intel-tbb')
     depends_on('libuuid')
-    # some bugs with python 3.8
-    depends_on('python@:3.7.99', when='@32.2:', type=('build', 'run'))
+    depends_on('nlohmann-json', when="@35.0:")
+    depends_on('python', type=('build', 'run'))
+    depends_on('python@:3.7.99', when='@32.2:34.99', type=('build', 'run'))
     depends_on('python@:2.99.99', when='@:32.1', type=('build', 'run'))
     depends_on('py-setuptools@:45.99.99', when='^python@:2.7.99', type='build')
     depends_on('py-six', type=('build', 'run'))
@@ -61,8 +59,7 @@ class Gaudi(CMakePackage):
     depends_on('zlib')
 
     # todo: this should be a test dependency only,
-    # should be fixed in the cmake-modernisation branch
-    depends_on('py-nose', when="@develop", type=('build', 'run'))
+    depends_on('py-nose', when="@35.0", type=('build', 'run'))
 
     # Adding these dependencies triggers the build of most optional components
     depends_on('cppgsl', when='+optional')
@@ -79,7 +76,7 @@ class Gaudi(CMakePackage):
     depends_on('py-networkx', when='+optional ^python@3.0.0:')
     depends_on('py-setuptools', when='+optional')
     depends_on('py-nose', when='+optional')
-    depends_on('relax', when='+optional')
+    depends_on('relax', when='@:33.99 +optional')
     depends_on('xerces-c', when='+optional')
     # NOTE: pocl cannot be added as a minimal OpenCL implementation because
     #       ROOT does not like being exposed to LLVM symbols.
@@ -89,10 +86,23 @@ class Gaudi(CMakePackage):
 
     def cmake_args(self):
         args = [
-            self.define_from_variant("BUILD_TESTING", "optional"),
-            # this is not really used in spack builds, but needs to be set
-            "-DHOST_BINARY_TAG=x86_64-linux-gcc9-opt",
-        ]
+            self.define_from_variant("BUILD_TESTING",             "optional"),
+            self.define_from_variant("GAUDI_USE_AIDA",            "optional"),
+            self.define_from_variant("GAUDI_USE_CLHEP",           "optional"),
+            self.define_from_variant("GAUDI_USE_CPPUNIT",         "optional"),
+            self.define_from_variant("GAUDI_USE_HEPPDT",          "optional"),
+            self.define_from_variant("GAUDI_USE_JEMALLOC",        "optional"),
+            self.define_from_variant("GAUDI_USE_UNWIND",          "optional"),
+            self.define_from_variant("GAUDI_USE_XERCESC",         "optional"),
+            self.define_from_variant("GAUDI_USE_DOXYGEN",         "docs"),
+            self.define("GAUDI_USE_PYTHON_MAJOR",
+                        str(self.spec['python'].version.up_to(1))),
+            # todo:
+            self.define("GAUDI_USE_INTELAMPLIFIER",  False),
+            self.define("GAUDI_USE_GPERFTOOLS",      False), ]
+        # this is not really used in spack builds, but needs to be set
+        if self.spec.version < Version('34.99'):
+            args.append("-DHOST_BINARY_TAG=x86_64-linux-gcc9-opt")
         return args
 
     def setup_run_environment(self, env):
diff --git a/var/spack/repos/builtin/packages/gaudi/python2.patch b/var/spack/repos/builtin/packages/gaudi/python2.patch
deleted file mode 100644
index 8afcebc929..0000000000
--- a/var/spack/repos/builtin/packages/gaudi/python2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cmake/GaudiDependencies.cmake b/cmake/GaudiDependencies.cmake
-index 7fc224cef..0323f8e5c 100644
---- a/cmake/GaudiDependencies.cmake
-+++ b/cmake/GaudiDependencies.cmake
-@@ -97,7 +97,7 @@ foreach(component IN ITEMS system filesystem regex thread python unit_test_frame
- endforeach()
- 
- set(Python_FIND_STRATEGY VERSION) # Find latest version available
--find_package(Python 2.7.15 ${__quiet} COMPONENTS Interpreter Development)
-+find_package(Python ${__quiet} COMPONENTS Interpreter Development)
- set_package_properties(Python PROPERTIES TYPE REQUIRED)
- 
- find_package(ROOT 6.18 ${__quiet} CONFIG COMPONENTS Core RIO Hist Thread Matrix
-`