Skip to content

Commit

Permalink
Make plugins depend on 1.9.0 and above
Browse files Browse the repository at this point in the history
  • Loading branch information
jhp-lanl committed Jul 25, 2024
1 parent 3d989e3 commit ed95ee0
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions spack-repo/packages/singularity-eos/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,14 @@ class SingularityEos(CMakePackage, CudaPackage):
default="none",
validator=plugin_validator,
description="list of plugins to build",
when="@main"
when="@1.9.0:"
)
variant("variant", default="default", description="include path used for variant header", when="@main")
variant("variant", default="default", description="include path used for variant header", when="@1.9.0:")

# building/testing/docs
depends_on("[email protected]:")
depends_on("[email protected]", when="@:1.8.0 +tests")
depends_on("[email protected]:", when="@1.9.0: +tests")
depends_on("[email protected]:", when="@main +tests")
depends_on("python@3:", when="+python")
depends_on("py-numpy", when="+python+tests")
depends_on("[email protected]:", when="+python")
Expand Down Expand Up @@ -217,7 +216,7 @@ def cmake_args(self):
self.define("SINGULARITY_USE_EOSPAC", "^eospac" in self.spec),
]

if self.spec.satisfies("@main"):
if self.spec.satisfies("@1.9.0:"):
if "none" not in self.spec.variants["plugins"].value:
pdirs = [join_path(self.stage.source_path, self.plugins[p]) for p in self.spec.variants["plugins"].value]
args.append(self.define("SINGULARITY_PLUGINS", ";".join(pdirs)))
Expand Down

0 comments on commit ed95ee0

Please sign in to comment.