summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjulian-zeidler <julian.zeidler@dlr.de>2023-03-29 07:33:05 +0200
committerGitHub <noreply@github.com>2023-03-29 01:33:05 -0400
commitaa99063065c16ad7acda6bcc6105c6d63722331d (patch)
treec0c7bb0caa39b1c5e7712eca42fb58e3aa19ab38
parent18c21d0c32048dd37cd74c968aff920197ce83d8 (diff)
downloadspack-aa99063065c16ad7acda6bcc6105c6d63722331d.tar.gz
spack-aa99063065c16ad7acda6bcc6105c6d63722331d.tar.bz2
spack-aa99063065c16ad7acda6bcc6105c6d63722331d.tar.xz
spack-aa99063065c16ad7acda6bcc6105c6d63722331d.zip
charliecloud: add squashfuse variant, add v0.32, v0.31 (#36404)
-rw-r--r--var/spack/repos/builtin/packages/charliecloud/package.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py
index d698e4a326..538a31ea74 100644
--- a/var/spack/repos/builtin/packages/charliecloud/package.py
+++ b/var/spack/repos/builtin/packages/charliecloud/package.py
@@ -17,6 +17,8 @@ class Charliecloud(AutotoolsPackage):
tags = ["e4s"]
version("master", branch="master")
+ version("0.32", sha256="47826b14966c400b250c35ff28a903f8e5b5e12d9e2a2b473e0f00f4e8393c47")
+ version("0.31", sha256="7305c3d9010386c1b96fb95297feccb5c9d7ff82a3377d1d98eb8faef76bced9")
version("0.30", sha256="97d45b25c9f813d8bae79b16de49503a165bc94c05dd2166975154d9b6ac78e9")
version(
"0.29",
@@ -74,6 +76,7 @@ class Charliecloud(AutotoolsPackage):
sha256="15ce63353afe1fc6bcc10979496a54fcd5628f997cb13c827c9fc7afb795bdc5",
)
variant("docs", default=False, description="Build man pages and html docs")
+ variant("squashfuse", default=False, description="Build with squashfuse support")
# Autoconf.
depends_on("m4", type="build")
@@ -102,6 +105,10 @@ class Charliecloud(AutotoolsPackage):
# See https://github.com/spack/spack/pull/16049.
conflicts("platform=darwin", msg="This package does not build on macOS")
+ # Squashfuse support
+ depends_on("squashfuse@0.1.105:", when="+squashfuse")
+ depends_on("squashfs", type="run", when="+squashfuse")
+
def autoreconf(self, spec, prefix):
which("bash")("autogen.sh")
@@ -117,4 +124,8 @@ class Charliecloud(AutotoolsPackage):
else:
args.append("--disable-html")
+ if "+squashfuse" in self.spec:
+ squashfuse_prefix = "{0}".format(self.spec["squashfuse"].prefix)
+ args.append("--with-libsquashfuse={0}".format(squashfuse_prefix))
+
return args