summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorJean-Paul Pelteret <jppelteret@gmail.com>2022-08-22 19:37:52 +0200
committerGitHub <noreply@github.com>2022-08-22 11:37:52 -0600
commit85b8a41ccb8166bfa21ff693a53c5d232dbf4361 (patch)
tree494ce1581fa6fd77510418235bee933f3daed6bb /var
parent6e5d6ebf99849536783d639ffe88f7ccca64a962 (diff)
downloadspack-85b8a41ccb8166bfa21ff693a53c5d232dbf4361.tar.gz
spack-85b8a41ccb8166bfa21ff693a53c5d232dbf4361.tar.bz2
spack-85b8a41ccb8166bfa21ff693a53c5d232dbf4361.tar.xz
spack-85b8a41ccb8166bfa21ff693a53c5d232dbf4361.zip
deal.II 9.4: Fix issues due to override of CMake FIND_PACKAGE macro (#32079)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/dealii/package.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py
index c6251d1dba..186d17db1e 100644
--- a/var/spack/repos/builtin/packages/dealii/package.py
+++ b/var/spack/repos/builtin/packages/dealii/package.py
@@ -249,6 +249,19 @@ class Dealii(CMakePackage, CudaPackage):
when="@9.2.0 ^boost@1.72.0:",
)
+ # Fix issues due to override of CMake FIND_PACKAGE macro
+ # https://github.com/dealii/dealii/pull/14158/files
+ patch(
+ "https://github.com/dealii/dealii/commit/06bb9dc07efb6fea9912ee0d66264af548c552c8.patch?full_index=1",
+ sha256="8a1f7b9a155c8c496ce08b2abb1ba5d329b3b29169f36c11678aa4e3cebf97a2",
+ when="@9.4.0 ^hdf5",
+ )
+ patch(
+ "https://github.com/dealii/dealii/commit/40076ac1a013cd7d221f9dda913b4d0e6452c21e.patch?full_index=1",
+ sha256="7869dfab1116b6e862279bb6642c2c8fe49d87c42cfc6f031e03330f9f26a6c3",
+ when="@9.4.0 ^python",
+ )
+
# Check for sufficiently modern versions
conflicts("cxxstd=11", when="@9.3:")