summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorThomas Madlener <thomas.madlener@desy.de>2024-06-20 13:47:14 +0200
committerGitHub <noreply@github.com>2024-06-20 13:47:14 +0200
commit49ba2d84a0749831751c46e25cac547bcebee730 (patch)
tree1e1ab29663709844d94650b7e1b6fb2664dda5ef /var
parent0cec923e0a425ebe4df7644e970442d49855e362 (diff)
downloadspack-49ba2d84a0749831751c46e25cac547bcebee730.tar.gz
spack-49ba2d84a0749831751c46e25cac547bcebee730.tar.bz2
spack-49ba2d84a0749831751c46e25cac547bcebee730.tar.xz
spack-49ba2d84a0749831751c46e25cac547bcebee730.zip
edm4hep: Make edm4hep extend python after upstream changes (#44681)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/edm4hep/package.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/edm4hep/package.py b/var/spack/repos/builtin/packages/edm4hep/package.py
index 7984506e5f..83d59edfc9 100644
--- a/var/spack/repos/builtin/packages/edm4hep/package.py
+++ b/var/spack/repos/builtin/packages/edm4hep/package.py
@@ -58,6 +58,9 @@ class Edm4hep(CMakePackage):
depends_on("heppdt", type="test")
depends_on("catch2@3.0.1:", type="test")
+ # Corresponding changes in EDM4hep landed with https://github.com/key4hep/EDM4hep/pull/314
+ extends("python", when="@0.10.6:")
+
def cmake_args(self):
args = []
# C++ Standard
@@ -67,7 +70,8 @@ class Edm4hep(CMakePackage):
def setup_run_environment(self, env):
env.prepend_path("LD_LIBRARY_PATH", self.spec["edm4hep"].libs.directories[0])
- env.prepend_path("PYTHONPATH", self.prefix.python)
+ if self.spec.satisfies("@:0.10.5"):
+ env.prepend_path("PYTHONPATH", self.prefix.python)
def url_for_version(self, version):
"""Translate version numbers to ilcsoft conventions.