From f9e58a52dad06caee5c7becd4e9025253a2571f4 Mon Sep 17 00:00:00 2001 From: Jordan Ogas Date: Thu, 19 Mar 2020 12:49:11 -0700 Subject: add charliecloud/0.14; remove umoci/skopeo; remove builder variant (#15573) * add charliecloud/0.14; remove umoci/skopeo; remove builder variant * fix typo * add maintainer; add explicit config doc options; add py-requests as run dependency * add autoconf build dependencies --- .../repos/builtin/packages/charliecloud/package.py | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index 9329455d84..e72c71cf86 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -9,22 +9,24 @@ from spack import * class Charliecloud(AutotoolsPackage): """Lightweight user-defined software stacks for HPC.""" + maintainers = ['j-ogas'] homepage = "https://hpc.github.io/charliecloud" - url = "https://github.com/hpc/charliecloud/releases/download/v0.9.10/charliecloud-0.9.10.tar.gz" + url = "https://github.com/hpc/charliecloud/releases/download/v0.14/charliecloud-0.9.10.tar.gz" git = "https://github.com/hpc/charliecloud.git" version('master', branch='master') - version('0.13', sha256='5740bff6e410ca99484c1bdf3dbe834c0f753c846d55c19d6162967a3e2718e0') + version('0.14', sha256='4ae23c2d6442949e16902f9d5604dbd1d6059aeb5dd461b11fc5c74d49dcb194') - depends_on('python@3.4:', type=('build', 'run')) + depends_on('m4', type='build') + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') - # experimental builder (ch-grow) - variant('builder', default=False, description='Bundle dependencies for unprivileged builder (ch-grow)') - depends_on('py-lark-parser', type='run', when='+builder') - depends_on('skopeo', type='run', when='+builder') - depends_on('umoci', type='run', when='+builder') + depends_on('python@3.5:', type='run') + depends_on('py-lark-parser', type='run') + depends_on('py-requests', type='run') - # man pages and html docs + # man pages and html docs variant variant('docs', default=False, description='Build man pages and html docs') depends_on('rsync', type='build', when='+docs') depends_on('py-sphinx', type='build', when='+docs') @@ -37,10 +39,9 @@ class Charliecloud(AutotoolsPackage): args = [] - if '+docs' not in self.spec: + if '+docs' in self.spec: + args.append('--enable-html') + else: args.append('--disable-html') - if '+builder' not in self.spec: - args.append('--disable-ch-grow') - return args -- cgit v1.2.3-70-g09d2