diff options
| author | bernhardkaindl <43588962+bernhardkaindl@users.noreply.github.com> | 2021-10-01 17:29:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 17:29:39 +0200 |
| commit | 6aff4831e3301bbff56a6310dad23d4dda9d820f (patch) | |
| tree | 97ffb3564c586d49fea18873c404575dbb2de530 | |
| parent | 7d77f36f839422b942990b6386f977463495baf3 (diff) | |
| download | spack-6aff4831e3301bbff56a6310dad23d4dda9d820f.tar.gz spack-6aff4831e3301bbff56a6310dad23d4dda9d820f.tar.bz2 spack-6aff4831e3301bbff56a6310dad23d4dda9d820f.tar.xz spack-6aff4831e3301bbff56a6310dad23d4dda9d820f.zip | |
cmor: bump version and depend on the specific libuuid packages needed by version. (#26149)
| -rw-r--r-- | var/spack/repos/builtin/packages/cmor/package.py | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/cmor/package.py b/var/spack/repos/builtin/packages/cmor/package.py index 9a468a6460..d375adc6c5 100644 --- a/var/spack/repos/builtin/packages/cmor/package.py +++ b/var/spack/repos/builtin/packages/cmor/package.py @@ -13,8 +13,11 @@ class Cmor(AutotoolsPackage): standard model experiments.""" homepage = "https://cmor.llnl.gov" - url = "https://github.com/PCMDI/cmor/archive/3.4.0.tar.gz" + url = "https://github.com/PCMDI/cmor/archive/3.6.1.tar.gz" + version('3.6.1', sha256='991035a41424f72ea6f0f85653fc13730eb035e63c7dff6ca740aa7a70976fb4') + version('3.6.0', sha256='1608904a35106e83d365f27522209c325bd4bfc19d022b1a8abfb12cdf85fe20') + version('3.5.0', sha256='37ce11332f9adfd4fa7560dfb358d14b300315221614c4a44c7407297103c62a') version('3.4.0', sha256='e700a6d50f435e6ffdedf23bf6832b7d37fe21dc78815e1372f218d1d52bd2cb') version('3.3.0', sha256='b763707272c470fc6f7077d9c541591a60f9075b52f5f0298eaf2cb2f2fff4d2') version('3.2.0', sha256='8d49899549dd4c08197739300d507e6fc2b4a5cfe2bfd3e6b44e8e3eaf79b132') @@ -23,10 +26,15 @@ class Cmor(AutotoolsPackage): variant('fortran', default=True, description='Enable Fortran API') variant('python', default=False, description='Enable PYTHON support') - depends_on('uuid') + # older releases require another implementation providing uuid_create() + # 3.6.1 requires libuuid(only the lib) or util-linux-uuid providing uuid_generate() + depends_on('hdf5') + depends_on('hdf5@:1.8.19', when='@:3.4.0') + depends_on('ossp-uuid', when='@:3.4.0') + depends_on('util-linux-uuid', when='@3.5.0:') + depends_on('json-c', when='@3.5.0:') depends_on('netcdf-c') depends_on('udunits') - depends_on('hdf5@:1.8.19') extends('python', when='+python') depends_on('python@:2', when='@:3.3 +python') @@ -46,8 +54,15 @@ class Cmor(AutotoolsPackage): else: extra_args.append('--disable-fortran') + if '+python' in self.spec: + extra_args.append('--with-python={0}'.format(self.spec['python'].prefix)) + return extra_args + def check(self): + """tests need downloaded files, testcases have manual instructions for that.""" + pass + def install(self, spec, prefix): make('install') |