Bump spack, use an external kerberos and remove a few workarounds

key4hep · Oct 20, 2023 · 0ffc1e1 · 0ffc1e1
1 parent ac8a28f
commit 0ffc1e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/.latest-commit b/.latest-commit
@@ -1 +1 @@
-ca872f9c34f6b360d9d67a91294fa66452867e78
+76c57af0213b199b996836dc5b706438e7f936dd
diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml
@@ -50,6 +50,13 @@ packages:
     externals:
     - spec: mesa-glu@99
       prefix: /usr
+  # Use the system kerberos, otherwise the tickets obtained at login with the
+  # system version don't appear for the spack kerberos
+  krb5:
+    buildable: False
+    externals:
+    - spec: krb5@99
+      prefix: /usr
 
 
   geant4:

diff --git a/packages/key4hep-stack/package.py b/packages/key4hep-stack/package.py
@@ -146,15 +146,6 @@ def setup_run_environment(self, env):
         # set vdt, needed for root, see https://github.com/spack/spack/pull/37278
         env.prepend_path("CPATH", self.spec["vdt"].prefix.include)
 
-        # remove when https://github.com/spack/spack/pull/37881 is merged
-        env.prepend_path("LD_LIBRARY_PATH", self.spec["podio"].libs.directories[0])
-        env.prepend_path("LD_LIBRARY_PATH", self.spec["edm4hep"].libs.directories[0])
-        env.prepend_path("LD_LIBRARY_PATH", self.spec["lcio"].libs.directories[0])
-
-        # remove when https://github.com/spack/spack/pull/38015 is merged
-        env.prepend_path("LD_LIBRARY_PATH", self.spec["dd4hep"].prefix.lib)
-        env.prepend_path("LD_LIBRARY_PATH", self.spec["dd4hep"].prefix.lib64)
-
         # Issue on ubuntu, whizard fails to load libomega.so.0
         if self.compiler.operating_system == "ubuntu22.04":
             env.prepend_path(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ca872f9c34f6b360d9d67a91294fa66452867e78
		76c57af0213b199b996836dc5b706438e7f936dd