diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-09-08 11:58:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 11:58:46 -0700 |
| commit | 3d3d65f3f70ab1308663eab1cdebefe2ba5a2b3d (patch) | |
| tree | 30c954c4201e910ea5b7a6c720b87bff568321ac /var | |
| parent | a22f5d8d8691dd12309ebdb613c01341b55da1c3 (diff) | |
| parent | 28537ae7b75f7001fc3c11a530a752093d7bcdc0 (diff) | |
| download | spack-3d3d65f3f70ab1308663eab1cdebefe2ba5a2b3d.tar.gz spack-3d3d65f3f70ab1308663eab1cdebefe2ba5a2b3d.tar.bz2 spack-3d3d65f3f70ab1308663eab1cdebefe2ba5a2b3d.tar.xz spack-3d3d65f3f70ab1308663eab1cdebefe2ba5a2b3d.zip | |
Merge pull request #1553 from adamjstewart/fixes/netcdf-hdf5
Fix NetCDF/HDF5 dependency resolution problems
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hdf5/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/netcdf/package.py | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index aedaf18218..70cd168cc0 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -52,7 +52,7 @@ class Hdf5(Package): variant('cxx', default=True, description='Enable C++ support') variant('fortran', default=True, description='Enable Fortran support') - variant('mpi', default=False, description='Enable MPI support') + variant('mpi', default=True, description='Enable MPI support') variant('szip', default=False, description='Enable szip support') variant('threadsafe', default=False, description='Enable thread-safe capabilities') diff --git a/var/spack/repos/builtin/packages/netcdf/package.py b/var/spack/repos/builtin/packages/netcdf/package.py index ab40c14340..5dc686c907 100644 --- a/var/spack/repos/builtin/packages/netcdf/package.py +++ b/var/spack/repos/builtin/packages/netcdf/package.py @@ -50,12 +50,18 @@ class Netcdf(Package): # Required for NetCDF-4 support depends_on("zlib") - depends_on('hdf5@:1.8+mpi', when='@:4.4.0+mpi') - depends_on('hdf5+mpi', when='@4.4.1:+mpi') - depends_on('hdf5@:1.8~mpi', when='@:4.4.0~mpi') - depends_on('hdf5~mpi', when='@4.4.1:~mpi') + depends_on('hdf5') + + # NetCDF 4.4.0 and prior have compatibility issues with HDF5 1.10 and later + # https://github.com/Unidata/netcdf-c/issues/250 + depends_on('hdf5@:1.8', when='@:4.4.0') def install(self, spec, prefix): + # Workaround until variant forwarding works properly + if '+mpi' in spec and spec.satisfies('^hdf5~mpi'): + raise RuntimeError('Invalid spec. Package netcdf requires ' + 'hdf5+mpi, but spec asked for hdf5~mpi.') + # Environment variables CPPFLAGS = [] LDFLAGS = [] |