From 7d64a8e81fc0c33ec7f8fe923a58b67da581d746 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Thu, 23 Jun 2022 16:03:03 -0600 Subject: add charliecloud 0.27 and fix master install (#31247) * charliecloud: custom autoreconf and require py-pip and py-wheel for master * charliecloud: add 0.27 * charliecloud: add minimum py-pip version --- var/spack/repos/builtin/packages/charliecloud/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index d4bcd8b7f8..6fc9200167 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -17,6 +17,7 @@ class Charliecloud(AutotoolsPackage): tags = ['e4s'] version('master', branch='master') + version('0.27', sha256='1142938ce73ec8a5dfe3a19a241b1f1ffbb63b582ac63d459aebec842c3f4b72') version('0.26', sha256='5e1e64e869c59905fac0cbbd6ceb82340ee54728415d28ef588fd5de5557038a') version('0.25', sha256='62d6fd211e3a573f54578e1b01d5c298f9788b7eaf2db46ac94c2dcef604cc94') version('0.24', sha256='63379bcbad7b90b33457251696d6720416e4acefcf2b49cd6cb495a567e511c2') @@ -35,6 +36,9 @@ class Charliecloud(AutotoolsPackage): # Version 0.25+ bundle the preferred lark version. depends_on('py-lark-parser', type='run', when='@:0.24') depends_on('py-requests', type='run') + # autogen.sh requires pip and wheel (only needed for git checkouts) + depends_on('py-pip@21.1.2:', type='build', when='@master') + depends_on('py-wheel', type='build', when='@master') # Man pages and html docs variant. variant('docs', default=False, description='Build man pages and html docs') @@ -48,6 +52,9 @@ class Charliecloud(AutotoolsPackage): # Bash automated testing harness (bats). depends_on('bats@0.4.0', type='test') + def autoreconf(self, spec, prefix): + which('sh')('autogen.sh') + def configure_args(self): args = [] -- cgit v1.2.3-70-g09d2