diff options
author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-01-07 20:07:00 -0600 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-01-07 18:06:59 -0800 |
commit | 68baac0549e816dce68ebab40c701b92f5f46dec (patch) | |
tree | 2e03ab37fc9c6c3676576057b4d4a01a9b944d28 /var/spack/repos/builtin/packages/nco | |
parent | a0195371e886e93110816209b118e994a497805c (diff) | |
download | spack-68baac0549e816dce68ebab40c701b92f5f46dec.tar.gz spack-68baac0549e816dce68ebab40c701b92f5f46dec.tar.bz2 spack-68baac0549e816dce68ebab40c701b92f5f46dec.tar.xz spack-68baac0549e816dce68ebab40c701b92f5f46dec.zip |
Various updates to the NCO package and dependencies (#2639)
* Remove +mpi variant from NCO
* Update NCO deps to AutotoolsPackage
* Update the other NetCDF packages to AutotoolsPackage
* ANTLR has a nolink deptype on java, don't worry about csharp
* Remove restrictions from NCO package, fix homepage
* Add version 4.6.3 of NCO
* Missed AutotoolsPackage for NetCDF-CXX4
* NetCDF tests fail when run in parallel
* Remove commented out dependency
* Add documentation dependency
Diffstat (limited to 'var/spack/repos/builtin/packages/nco')
-rw-r--r-- | var/spack/repos/builtin/packages/nco/package.py | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/var/spack/repos/builtin/packages/nco/package.py b/var/spack/repos/builtin/packages/nco/package.py index d38ea4636b..acd96f5e9c 100644 --- a/var/spack/repos/builtin/packages/nco/package.py +++ b/var/spack/repos/builtin/packages/nco/package.py @@ -29,35 +29,27 @@ class Nco(AutotoolsPackage): """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible formats""" - homepage = "https://sourceforge.net/projects/nco" + homepage = "http://nco.sourceforge.net/" url = "https://github.com/nco/nco/archive/4.6.2.tar.gz" + version('4.6.3', '0e1d6616c65ed3a30c54cc776da4f987') version('4.6.2', 'b7471acf0cc100343392f4171fb56113') version('4.6.1', 'ef43cc989229c2790a9094bd84728fd8') version('4.5.5', '9f1f1cb149ad6407c5a03c20122223ce') + variant('doc', default=False, description='Build/install NCO TexInfo-based documentation') + # See "Compilation Requirements" at: # http://nco.sourceforge.net/#bld - variant('mpi', default=True) - depends_on('netcdf') depends_on('antlr@2.7.7+cxx') # required for ncap2 depends_on('gsl') # desirable for ncap2 depends_on('udunits2') # allows dimensional unit transformations - # depends_on('opendap') # enables network transparency - @AutotoolsPackage.precondition('configure') - def validate(self): - """Ensures that dependents were built with the right variants.""" - # Workaround until variant forwarding works properly - spec = self.spec - if '+mpi' in spec and spec.satisfies('^netcdf~mpi'): - raise RuntimeError('Invalid spec. Package netcdf requires ' - 'netcdf+mpi, but spec asked for netcdf~mpi.') + depends_on('flex', type='build') + depends_on('bison', type='build') + depends_on('texinfo@4.12:', type='build', when='+doc') def configure_args(self): - return [ - '--disable-openmp', # TODO: Make this a variant - '--disable-dap', # TODO: Make this a variant - '--disable-esmf' - ] + spec = self.spec + return ['--{0}-doc'.format('enable' if '+doc' in spec else 'disable')] |