diff options
author | Adam J. Stewart <ajstewart426@gmail.com> | 2019-10-28 20:27:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-28 20:27:54 -0500 |
commit | 2264e30d99d8b9fbdec8fa69b594e53d8ced15a1 (patch) | |
tree | b361d4d420ab2668be84cf27efb808d364a2abc1 /var/spack/repos/builtin/packages/ferret | |
parent | 4367e16740ccd39515ad75e86cce9f65ac46ca69 (diff) | |
download | spack-2264e30d99d8b9fbdec8fa69b594e53d8ced15a1.tar.gz spack-2264e30d99d8b9fbdec8fa69b594e53d8ced15a1.tar.bz2 spack-2264e30d99d8b9fbdec8fa69b594e53d8ced15a1.tar.xz spack-2264e30d99d8b9fbdec8fa69b594e53d8ced15a1.zip |
Update URL parsing regexes and tests (#13411)
* Update URL parsing regexes and tests
* Get rid of no longer used README
* Merge py-udunits and py-cf-units
* netcdf -> netcdf-c
* setup_environment -> setup_*_environment
* Fix doc tests
* Few last minute fixes
* Simplify prefix removal copypasta
Diffstat (limited to 'var/spack/repos/builtin/packages/ferret')
-rw-r--r-- | var/spack/repos/builtin/packages/ferret/package.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/ferret/package.py b/var/spack/repos/builtin/packages/ferret/package.py index 0113dfba3a..47aff3cbf5 100644 --- a/var/spack/repos/builtin/packages/ferret/package.py +++ b/var/spack/repos/builtin/packages/ferret/package.py @@ -19,7 +19,7 @@ class Ferret(Package): version('6.96', sha256='7eb87156aa586cfe838ab83f08b2102598f9ab62062d540a5da8c9123816331a') depends_on("hdf5+hl") - depends_on("netcdf") + depends_on("netcdf-c") depends_on("netcdf-fortran") depends_on("readline") depends_on("zlib") @@ -63,7 +63,7 @@ class Ferret(Package): "-L%s -lnetcdff" % self.spec['netcdf-fortran'].prefix.lib, 'FERRET/platform_specific.mk.x86_64-linux') filter_file(r'\$\(NETCDF4_DIR\)/lib64/libnetcdf.a', - "-L%s -lnetcdf" % self.spec['netcdf'].prefix.lib, + "-L%s -lnetcdf" % self.spec['netcdf-c'].prefix.lib, 'FERRET/platform_specific.mk.x86_64-linux') filter_file(r'\$\(HDF5_DIR\)/lib64/libhdf5_hl.a', "-L%s -lhdf5_hl" % self.spec['hdf5'].prefix.lib, |