diff options
| author | Michael Kuhn <michael.kuhn@informatik.uni-hamburg.de> | 2019-11-06 18:13:21 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-11-06 11:13:21 -0600 |
| commit | 95bc67744593e59f1a11ccb4133e7e89ac044ed8 (patch) | |
| tree | 78826e9e4b7fc855f7ea8f33e4efd035739bf8f6 | |
| parent | e292bef411f8296742fb6c6dd5ffbf93aea1ddd5 (diff) | |
| download | spack-95bc67744593e59f1a11ccb4133e7e89ac044ed8.tar.gz spack-95bc67744593e59f1a11ccb4133e7e89ac044ed8.tar.bz2 spack-95bc67744593e59f1a11ccb4133e7e89ac044ed8.tar.xz spack-95bc67744593e59f1a11ccb4133e7e89ac044ed8.zip | |
cdo: Fix with_or_without calls (#13614)
netcdf has been renamed to netcdf-c and udunits2 has been renamed to
udunits.
| -rw-r--r-- | var/spack/repos/builtin/packages/cdo/package.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/cdo/package.py b/var/spack/repos/builtin/packages/cdo/package.py index 0c0692852a..5a584e5e86 100644 --- a/var/spack/repos/builtin/packages/cdo/package.py +++ b/var/spack/repos/builtin/packages/cdo/package.py @@ -79,7 +79,9 @@ class Cdo(AutotoolsPackage): msg='GCC 9 changed OpenMP data sharing behavior') def configure_args(self): - config_args = self.with_or_without('netcdf', activation_value='prefix') + config_args = self.with_or_without( + 'netcdf', + activation_value=lambda x: self.spec['netcdf-c'].prefix) if self.spec.variants['grib2'].value == 'eccodes': config_args.append('--with-eccodes=' + @@ -108,8 +110,9 @@ class Cdo(AutotoolsPackage): config_args += self.with_or_without('hdf5', activation_value='prefix') - config_args += self.with_or_without('udunits2', - activation_value='prefix') + config_args += self.with_or_without( + 'udunits2', + activation_value=lambda x: self.spec['udunits'].prefix) config_args += self.with_or_without('libxml2', activation_value='prefix') |