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/fstrack | |
| 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/fstrack')
| -rw-r--r-- | var/spack/repos/builtin/packages/fstrack/package.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/fstrack/package.py b/var/spack/repos/builtin/packages/fstrack/package.py index 297af6dbac..ffbb1714f5 100644 --- a/var/spack/repos/builtin/packages/fstrack/package.py +++ b/var/spack/repos/builtin/packages/fstrack/package.py @@ -20,25 +20,25 @@ class Fstrack(MakefilePackage): variant('flow', default=True, description='Build the flow tracker') depends_on('gmt@4.0:4.999', when='+flow') - depends_on('netcdf', when='+flow') + depends_on('netcdf-c', when='+flow') parallel = False - def setup_environment(self, spack_env, run_env): + def setup_build_environment(self, env): # Compilers - spack_env.set('F90', spack_fc) + env.set('F90', spack_fc) # Compiler flags (assumes GCC) - spack_env.set('CFLAGS', '-O2') - spack_env.set('FFLAGS', '-ffixed-line-length-132 -x f77-cpp-input -O2') - spack_env.set('FFLAGS_DEBUG', '-g -x f77-cpp-input') - spack_env.set('F90FLAGS', '-O2 -x f95-cpp-input') - spack_env.set('F90FLAGS_DEBUG', '-g -x f95-cpp-input') - spack_env.set('LDFLAGS', '-lm') + env.set('CFLAGS', '-O2') + env.set('FFLAGS', '-ffixed-line-length-132 -x f77-cpp-input -O2') + env.set('FFLAGS_DEBUG', '-g -x f77-cpp-input') + env.set('F90FLAGS', '-O2 -x f95-cpp-input') + env.set('F90FLAGS_DEBUG', '-g -x f95-cpp-input') + env.set('LDFLAGS', '-lm') if '+flow' in self.spec: - spack_env.set('GMTHOME', self.spec['gmt'].prefix) - spack_env.set('NETCDFDIR', self.spec['netcdf'].prefix) + env.set('GMTHOME', self.spec['gmt'].prefix) + env.set('NETCDFDIR', self.spec['netcdf-c'].prefix) def build(self, spec, prefix): with working_dir('eispack'): |