From c2e3658a5433d833d0b5da980683153dc1ca46a1 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 21 Nov 2024 20:08:32 -0600 Subject: [PATCH 01/10] acts: remove podio@:0 version limit in upstream spack --- packages/acts/package.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/acts/package.py b/packages/acts/package.py index ea1077a4..f6b56eaf 100644 --- a/packages/acts/package.py +++ b/packages/acts/package.py @@ -3,12 +3,28 @@ class Acts(BuiltinActs): + def __init__(self, spec): + super(Acts, self).__init__(spec) + # HACK Remove upstream limitations on podio@:0 + for _spec in ["@:35+edm4hep", "@:35+podio"]: + if spack.spec.Spec(_spec) in Acts.dependencies: + del Acts.dependencies[spack.spec.Spec(_spec)] + patch( "https://github.com/acts-project/acts/commit/3255dfc3dddf9c7a82aaddb041d4a6f095d19124.patch?full_index=1", sha256="60317f6a09a7d57721c1234fcf087ae85aeab27653976d1d3ac7a846c3b85a89", when="@20.1.0:26", ) + + @when("@34:35") + def patch(self): + super().patch() + # HACK Remove upstream limitations on podio@:0 + filter_file("_acts_podio_version 0.16", "_acts_podio_version 1.0", "CMakeLists.txt") + def cmake_args(self): args = super().cmake_args() args.append(self.define("Python_EXECUTABLE", self.spec["python"].command.path)) return args + +_acts = Acts("acts") From 2dad84a0523814203df99504c7ef251b10c92c37 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 21 Nov 2024 20:32:16 -0600 Subject: [PATCH 02/10] acts: rm super().patch() --- packages/acts/package.py | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/acts/package.py b/packages/acts/package.py index f6b56eaf..c6c23366 100644 --- a/packages/acts/package.py +++ b/packages/acts/package.py @@ -18,7 +18,6 @@ def __init__(self, spec): @when("@34:35") def patch(self): - super().patch() # HACK Remove upstream limitations on podio@:0 filter_file("_acts_podio_version 0.16", "_acts_podio_version 1.0", "CMakeLists.txt") From 662c3c7f9798c870cd266932638153a905e771cc Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 21 Nov 2024 20:33:30 -0600 Subject: [PATCH 03/10] acts: comment --- packages/acts/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/acts/package.py b/packages/acts/package.py index c6c23366..6cf6725c 100644 --- a/packages/acts/package.py +++ b/packages/acts/package.py @@ -26,4 +26,6 @@ def cmake_args(self): args.append(self.define("Python_EXECUTABLE", self.spec["python"].command.path)) return args + +# instantiate at least once _acts = Acts("acts") From b9b4ef743c6b6a2462720428f578e351abe8e376 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 21 Nov 2024 22:15:35 -0600 Subject: [PATCH 04/10] acts: patch for @33:35 --- packages/acts/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/acts/package.py b/packages/acts/package.py index 6cf6725c..d553cc61 100644 --- a/packages/acts/package.py +++ b/packages/acts/package.py @@ -16,7 +16,7 @@ def __init__(self, spec): when="@20.1.0:26", ) - @when("@34:35") + @when("@33:35") def patch(self): # HACK Remove upstream limitations on podio@:0 filter_file("_acts_podio_version 0.16", "_acts_podio_version 1.0", "CMakeLists.txt") From bd070849d67f141677db9809e62deba56385a624 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 22 Nov 2024 07:18:56 -0600 Subject: [PATCH 05/10] acts: patch add schema_version to Plugins/Podio/edm.yml --- packages/acts/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/acts/package.py b/packages/acts/package.py index d553cc61..99104bbf 100644 --- a/packages/acts/package.py +++ b/packages/acts/package.py @@ -10,6 +10,14 @@ def __init__(self, spec): if spack.spec.Spec(_spec) in Acts.dependencies: del Acts.dependencies[spack.spec.Spec(_spec)] + # Plugins/Podio/edm.yml: add schema_version + patch( + "https://github.com/acts-project/acts/commit/8fce1a7b32aa39f967919adc4cabebbfde2a7a97.patch?full_index=1", + sha256="https://github.com/acts-project/acts/commit/8fce1a7b32aa39f967919adc4cabebbfde2a7a97.patch?full_index=1", + when="@30.3.0:34.0", + ) + + # CMakeLists.txt: fix ACTS_USE_SYSTEM_ACTSVG typo patch( "https://github.com/acts-project/acts/commit/3255dfc3dddf9c7a82aaddb041d4a6f095d19124.patch?full_index=1", sha256="60317f6a09a7d57721c1234fcf087ae85aeab27653976d1d3ac7a846c3b85a89", From 3d368c3ff43ccbc2a792be1b8ab01969bb874a0f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 22 Nov 2024 10:07:17 -0600 Subject: [PATCH 06/10] acts: fix hash --- packages/acts/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/acts/package.py b/packages/acts/package.py index 99104bbf..28705e15 100644 --- a/packages/acts/package.py +++ b/packages/acts/package.py @@ -13,7 +13,7 @@ def __init__(self, spec): # Plugins/Podio/edm.yml: add schema_version patch( "https://github.com/acts-project/acts/commit/8fce1a7b32aa39f967919adc4cabebbfde2a7a97.patch?full_index=1", - sha256="https://github.com/acts-project/acts/commit/8fce1a7b32aa39f967919adc4cabebbfde2a7a97.patch?full_index=1", + sha256="78d4fac4235f7659c674a267f11e2d5bcad82af0d9df2036ef620d64997497d0", when="@30.3.0:34.0", ) From 7fea7a85e0a950674d3a862aacf02b2652aeecd7 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 22 Nov 2024 10:26:36 -0600 Subject: [PATCH 07/10] acts: hidden global with spec not str --- packages/acts/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/acts/package.py b/packages/acts/package.py index 28705e15..8ff0cb77 100644 --- a/packages/acts/package.py +++ b/packages/acts/package.py @@ -36,4 +36,4 @@ def cmake_args(self): # instantiate at least once -_acts = Acts("acts") +_acts = Acts(spack.spec.Spec("acts")) From 32da89c50e2d1d581010aadfcb449892f3835d17 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 27 Nov 2024 15:26:15 -0600 Subject: [PATCH 08/10] k4fwcore: add package; patch for podio-1 when @:1.0pre19 --- packages/k4fwcore/package.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/k4fwcore/package.py diff --git a/packages/k4fwcore/package.py b/packages/k4fwcore/package.py new file mode 100644 index 00000000..59a70cdf --- /dev/null +++ b/packages/k4fwcore/package.py @@ -0,0 +1,11 @@ +from spack import * +from spack.pkg.k4.k4fwcore import K4fwcore as BuiltinK4fwcore + + +class K4fwcore(BuiltinK4fwcore): + # Allow podio@1: in CMakeLists.txt + patch( + "https://github.com/key4hep/k4FWCore/commit/d6e72d1fe24fe3e1c28d667a84e9f97e295d8976.patch?full_index=1", + sha256sum="55c77a1eb7b57d14e0901f178bdd630311bebdd75eb971d659e37657a90e5738", + when="@1.0pre17:1.0pre19", + ) From 9e9ebb65189c64e4424fe8e2f85a001090041718 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 27 Nov 2024 15:43:59 -0600 Subject: [PATCH 09/10] k4fwcore: non cogito, ergo non sum --- packages/k4fwcore/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/k4fwcore/package.py b/packages/k4fwcore/package.py index 59a70cdf..bc74b142 100644 --- a/packages/k4fwcore/package.py +++ b/packages/k4fwcore/package.py @@ -6,6 +6,6 @@ class K4fwcore(BuiltinK4fwcore): # Allow podio@1: in CMakeLists.txt patch( "https://github.com/key4hep/k4FWCore/commit/d6e72d1fe24fe3e1c28d667a84e9f97e295d8976.patch?full_index=1", - sha256sum="55c77a1eb7b57d14e0901f178bdd630311bebdd75eb971d659e37657a90e5738", + sha256="55c77a1eb7b57d14e0901f178bdd630311bebdd75eb971d659e37657a90e5738", when="@1.0pre17:1.0pre19", ) From ca9f5793c06ca03c74ffabfd12f6e88c93b0d70b Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 27 Nov 2024 18:52:44 -0600 Subject: [PATCH 10/10] k4fwcore: patch: remove rootUtils.h header that has become unnecessary --- packages/k4fwcore/package.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/k4fwcore/package.py b/packages/k4fwcore/package.py index bc74b142..4105f2f7 100644 --- a/packages/k4fwcore/package.py +++ b/packages/k4fwcore/package.py @@ -3,6 +3,12 @@ class K4fwcore(BuiltinK4fwcore): + # Remove rootUtils.h header that has become unnecessary + patch( + "https://github.com/key4hep/k4FWCore/commit/70c9c113f48d941822066430f48eee8be007f49b.patch?full_index=1", + sha256="165e809c24a807d0b3e29b575e913ca09bf79f7f8308de44bf955db7c99fc5b9", + when="@1.0pre18:1.0pre19", + ) # Allow podio@1: in CMakeLists.txt patch( "https://github.com/key4hep/k4FWCore/commit/d6e72d1fe24fe3e1c28d667a84e9f97e295d8976.patch?full_index=1",