From 49ba2d84a0749831751c46e25cac547bcebee730 Mon Sep 17 00:00:00 2001
From: Thomas Madlener <thomas.madlener@desy.de>
Date: Thu, 20 Jun 2024 13:47:14 +0200
Subject: edm4hep: Make edm4hep extend python after upstream changes (#44681)
---
var/spack/repos/builtin/packages/edm4hep/package.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'var')
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.
--
cgit v1.2.3-70-g09d2