Skip to content

Commit 07c152b

Browse files
Update PETSc dependencies for PFLARE versions
1 parent 13121fe commit 07c152b

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

packages/pflare/package.py

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import os
66

7-
from spack_repo.builtin.build_systems.makefile import MakefilePackage
7+
from spack.build_systems.makefile import MakefilePackage
88

99
from spack.package import *
1010
from spack.util.environment import EnvironmentModifications
@@ -22,10 +22,18 @@ class Pflare(MakefilePackage):
2222
maintainers("stevendargaville")
2323
license("MIT", checked_by="stevendargaville")
2424

25+
version(
26+
"1.25.0",
27+
sha256="befb361b39c7601a8ca6f148369313f5755b238d5f6a4cbf91b19b23c93e8952",
28+
preferred=True,
29+
)
30+
version(
31+
"1.24.11",
32+
sha256="8bcbee9e58ac3b2627dfbe78ebfac375192fb97d87337b40962d2730935ea1ce",
33+
)
2534
version(
2635
"1.24.10",
2736
sha256="1d51ea420413d9959ea1a8a9499a663487672f08107838eaa6be11eab1e6fc2a",
28-
preferred=True,
2937
)
3038
version("main", branch="main")
3139

@@ -42,9 +50,15 @@ class Pflare(MakefilePackage):
4250
depends_on("lapack")
4351
depends_on("metis")
4452
depends_on("parmetis")
45-
depends_on("[email protected]:")
46-
# Bug fixed in https://gitlab.com/petsc/petsc/-/merge_requests/8768
47-
conflicts("^[email protected]", msg="PETSc 3.24.0 has a known bug in a routine used in PFLARE")
53+
54+
# PETSc version dependencies
55+
depends_on("[email protected]:", when="@1.25.0:")
56+
depends_on("[email protected]:3.23.7", when="@:1.24.11")
57+
# Bugs in 3.24.0 fixed in:
58+
# https://gitlab.com/petsc/petsc/-/merge_requests/8768
59+
# https://gitlab.com/petsc/petsc/-/merge_requests/8713
60+
conflicts("^[email protected]", msg="PETSc 3.24.0 has a known bugs in routines used by PFLARE")
61+
4862
# Optional Python dependencies (needed at build/run time by python/setup.py)
4963
depends_on("python", when="+python", type=("build", "run"))
5064
depends_on("py-setuptools", when="+python", type="build")

0 commit comments

Comments
 (0)