diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-05-05 00:51:49 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-05-05 00:51:49 -0700 |
| commit | c1010c34221d5acf433313a167b53915c9b0c08d (patch) | |
| tree | 21f030bc4231d0991831cdd99310b9d98e6da87b /var | |
| parent | 1181ad2bf06db1cf8958538101050a638de0a563 (diff) | |
| parent | eaa45d8a9a8cd26379ea7bd3bcee99cbab08d9e7 (diff) | |
| download | spack-c1010c34221d5acf433313a167b53915c9b0c08d.tar.gz spack-c1010c34221d5acf433313a167b53915c9b0c08d.tar.bz2 spack-c1010c34221d5acf433313a167b53915c9b0c08d.tar.xz spack-c1010c34221d5acf433313a167b53915c9b0c08d.zip | |
Merge pull request #889 from adamjstewart/features/netcdf
Remove hdf5 ~cxx constraint on netcdf
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/netcdf/package.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/netcdf/package.py b/var/spack/repos/builtin/packages/netcdf/package.py index a4d9e5213c..4aad0f6f3c 100644 --- a/var/spack/repos/builtin/packages/netcdf/package.py +++ b/var/spack/repos/builtin/packages/netcdf/package.py @@ -12,16 +12,19 @@ class Netcdf(Package): version('4.4.0', 'cffda0cbd97fdb3a06e9274f7aef438e') version('4.3.3', '5fbd0e108a54bd82cb5702a73f56d2ae') - variant('mpi', default=True, description='Enables MPI parallelism') - variant('hdf4', default=False, description="Enable HDF4 support") + variant('mpi', default=True, description='Enables MPI parallelism') + variant('hdf4', default=False, description='Enable HDF4 support') - # Dependencies: - depends_on("curl") # required for DAP support - depends_on("hdf", when='+hdf4') - depends_on("hdf5+mpi~cxx", when='+mpi') # required for NetCDF-4 support - depends_on("hdf5~mpi", when='~mpi') # required for NetCDF-4 support - depends_on("zlib") # required for NetCDF-4 support depends_on("m4") + depends_on("hdf", when='+hdf4') + + # Required for DAP support + depends_on("curl") + + # Required for NetCDF-4 support + depends_on("zlib") + depends_on("hdf5+mpi", when='+mpi') + depends_on("hdf5~mpi", when='~mpi') def install(self, spec, prefix): # Environment variables @@ -49,7 +52,7 @@ class Netcdf(Package): # /usr/lib/x86_64-linux-gnu/libcurl.so: undefined reference to `SSL_CTX_use_certificate_chain_file@OPENSSL_1.0.0' LIBS.append("-lcurl") CPPFLAGS.append("-I%s" % spec['curl'].prefix.include) - LDFLAGS.append ("-L%s" % spec['curl'].prefix.lib) + LDFLAGS.append( "-L%s" % spec['curl'].prefix.lib) if '+mpi' in spec: config_args.append('--enable-parallel4') |