zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cdo: Fix with_or_without calls (#13614)

Browse Source 
netcdf has been renamed to netcdf-c and udunits2 has been renamed to
udunits.
This commit is contained in:
Michael Kuhn 2019-11-06 18:13:21 +01:00 committed by Adam J. Stewart
parent e292bef411
commit 95bc677445
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
var/spack/repos/builtin/packages/cdo/package.py
View File

@ -79,7 +79,9 @@ class Cdo(AutotoolsPackage):
msg='GCC 9 changed OpenMP data sharing behavior') msg='GCC 9 changed OpenMP data sharing behavior')
def configure_args(self): 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': if self.spec.variants['grib2'].value == 'eccodes':
config_args.append('--with-eccodes=' + config_args.append('--with-eccodes=' +
@ -108,8 +110,9 @@ def configure_args(self):
config_args += self.with_or_without('hdf5', config_args += self.with_or_without('hdf5',
activation_value='prefix') activation_value='prefix')
config_args += self.with_or_without('udunits2', config_args += self.with_or_without(
activation_value='prefix') 'udunits2',
activation_value=lambda x: self.spec['udunits'].prefix)
config_args += self.with_or_without('libxml2', config_args += self.with_or_without('libxml2',
activation_value='prefix') activation_value='prefix')