summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarson Woods <carsonwoods@users.noreply.github.com>2020-04-29 18:22:22 -0400
committerGitHub <noreply@github.com>2020-04-29 17:22:22 -0500
commitd12e588c60cb98382c3f6907492fbb220e50d62d (patch)
tree348b94ce684db7055237b1e41c9aab9af15b4812
parenteef75ddd45f7d5a268cbf9eafd3af5143c271391 (diff)
downloadspack-d12e588c60cb98382c3f6907492fbb220e50d62d.tar.gz
spack-d12e588c60cb98382c3f6907492fbb220e50d62d.tar.bz2
spack-d12e588c60cb98382c3f6907492fbb220e50d62d.tar.xz
spack-d12e588c60cb98382c3f6907492fbb220e50d62d.zip
charliecloud: add more checksummed versions (#16146)
* Add more checksummed versions * Remove all versions not supported by autotools build method * Add old build system for older versions * Add suggested changes
-rw-r--r--var/spack/repos/builtin/packages/charliecloud/package.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py
index 59f39fd530..061ba5cf76 100644
--- a/var/spack/repos/builtin/packages/charliecloud/package.py
+++ b/var/spack/repos/builtin/packages/charliecloud/package.py
@@ -17,15 +17,22 @@ class Charliecloud(AutotoolsPackage):
version('master', branch='master')
version('0.15', sha256='2163420d43c934151c4f44a188313bdb7f79e576d5a86ba64b9ea45f784b9921')
version('0.14', sha256='4ae23c2d6442949e16902f9d5604dbd1d6059aeb5dd461b11fc5c74d49dcb194')
+ version('0.13', sha256='5740bff6e410ca99484c1bdf3dbe834c0f753c846d55c19d6162967a3e2718e0')
depends_on('m4', type='build')
depends_on('autoconf', type='build')
depends_on('automake', type='build')
depends_on('libtool', type='build')
- depends_on('python@3.5:', type='run')
- depends_on('py-lark-parser', type='run')
- depends_on('py-requests', type='run')
+ # Use skopeo and umoci for older ch-grow version dependencies
+ depends_on('skopeo', type='run', when='@0.10:0.13')
+ depends_on('umoci', type='run', when='@0.10:0.13')
+ depends_on('python+libxml2', type='run', when='@0.10:0.13')
+
+ # Charliecloud@0.14 and up use python for building
+ depends_on('python@3.5:', type='run', when='@0.14:')
+ depends_on('py-lark-parser', type='run', when='@0.14:')
+ depends_on('py-requests', type='run', when='@0.14:')
# man pages and html docs variant
variant('docs', default=False, description='Build man pages and html docs')
@@ -37,6 +44,7 @@ class Charliecloud(AutotoolsPackage):
# bash automated testing harness (bats)
depends_on('bats@0.4.0', type='test')
+ depends_on('python@3.5:', type='test')
def configure_args(self):