diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2016-05-03 13:28:38 -0500 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2016-05-03 13:28:38 -0500 |
| commit | eaa45d8a9a8cd26379ea7bd3bcee99cbab08d9e7 (patch) | |
| tree | 8a193ce2a081a189f400abde8b1c7dd471e334a9 | |
| parent | f850e4d2d43cbb05670dc5cad8a987f76fa9d9ae (diff) | |
| download | spack-eaa45d8a9a8cd26379ea7bd3bcee99cbab08d9e7.tar.gz spack-eaa45d8a9a8cd26379ea7bd3bcee99cbab08d9e7.tar.bz2 spack-eaa45d8a9a8cd26379ea7bd3bcee99cbab08d9e7.tar.xz spack-eaa45d8a9a8cd26379ea7bd3bcee99cbab08d9e7.zip | |
Remove hdf5 ~cxx constraint on netcdf
| -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') |