diff options
author | Adam J. Stewart <ajstewart426@gmail.com> | 2016-08-18 14:40:21 -0500 |
---|---|---|
committer | Adam J. Stewart <ajstewart426@gmail.com> | 2016-08-18 14:40:21 -0500 |
commit | 28537ae7b75f7001fc3c11a530a752093d7bcdc0 (patch) | |
tree | 2bb695628ef592565f470935150fcb24c0de7ccd | |
parent | 4d12c5455a18e14b77badca5e27743af47339947 (diff) | |
download | spack-28537ae7b75f7001fc3c11a530a752093d7bcdc0.tar.gz spack-28537ae7b75f7001fc3c11a530a752093d7bcdc0.tar.bz2 spack-28537ae7b75f7001fc3c11a530a752093d7bcdc0.tar.xz spack-28537ae7b75f7001fc3c11a530a752093d7bcdc0.zip |
Workaround until variant forwarding works properly
-rw-r--r-- | var/spack/repos/builtin/packages/hdf5/package.py | 2 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/netcdf/package.py | 9 |
2 files changed, 6 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 9b4d80119c..5dc686c907 100644 --- a/var/spack/repos/builtin/packages/netcdf/package.py +++ b/var/spack/repos/builtin/packages/netcdf/package.py @@ -52,15 +52,16 @@ class Netcdf(Package): depends_on("zlib") depends_on('hdf5') - # Variant forwarding - depends_on('hdf5+mpi', when='+mpi') - depends_on('hdf5~mpi', when='~mpi') - # 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 = [] |