diff options
| author | Carson Woods <carsonwoods@users.noreply.github.com> | 2020-04-28 12:15:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 11:15:19 -0500 |
| commit | 6e63ff1688e79878554a79b8d2132d4141cd1913 (patch) | |
| tree | 8f09872a10d514ada0c0d1578a3d0a3a64711ae4 /var | |
| parent | 4ed5cee9408cbeedd5764c6d165743981e40bb9e (diff) | |
| download | spack-6e63ff1688e79878554a79b8d2132d4141cd1913.tar.gz spack-6e63ff1688e79878554a79b8d2132d4141cd1913.tar.bz2 spack-6e63ff1688e79878554a79b8d2132d4141cd1913.tar.xz spack-6e63ff1688e79878554a79b8d2132d4141cd1913.zip | |
netcdf-fortran: add new variants (#16046)
* Add additional variants to netcdf-fortran
* Fix duplicate variant
* Clean up variants based on review feedback
* Addtional variant changes
* Convert jna variant to single line
* Fix proper version constraints for jna variant
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/netcdf-c/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/netcdf-fortran/package.py | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py index 62a3a43cbe..153a1057b1 100644 --- a/var/spack/repos/builtin/packages/netcdf-c/package.py +++ b/var/spack/repos/builtin/packages/netcdf-c/package.py @@ -61,6 +61,7 @@ class NetcdfC(AutotoolsPackage): description='Produce position-independent code (for shared libs)') variant('shared', default=True, description='Enable shared library') variant('dap', default=False, description='Enable DAP support') + variant('jna', default=False, description='Enable JNA support') # It's unclear if cdmremote can be enabled if '--enable-netcdf-4' is passed # to the configure script. Since netcdf-4 support is mandatory we comment @@ -181,6 +182,9 @@ class NetcdfC(AutotoolsPackage): else: config_args.append('--disable-parallel4') + if self.spec.satisfies('@4.3.2:'): + config_args += self.enable_or_disable('jna') + # Starting version 4.1.3, --with-hdf5= and other such configure options # are removed. Variables CPPFLAGS, LDFLAGS, and LD_LIBRARY_PATH must be # used instead. diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py index 1b55df1507..e4dd1ea884 100644 --- a/var/spack/repos/builtin/packages/netcdf-fortran/package.py +++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py @@ -27,6 +27,7 @@ class NetcdfFortran(AutotoolsPackage): variant('pic', default=True, description='Produce position-independent code (for shared libs)') variant('shared', default=True, description='Enable shared library') + variant('doc', default=False, description='Enable building docs') # We need to build with MPI wrappers if parallel I/O features is enabled: # https://www.unidata.ucar.edu/software/netcdf/docs/building_netcdf_fortran.html @@ -34,6 +35,7 @@ class NetcdfFortran(AutotoolsPackage): depends_on('netcdf-c~mpi', when='~mpi') depends_on('netcdf-c+mpi', when='+mpi') + depends_on('doxygen', when='+doc', type='build') # The default libtool.m4 is too old to handle NAG compiler properly: # https://github.com/Unidata/netcdf-fortran/issues/94 @@ -120,6 +122,11 @@ class NetcdfFortran(AutotoolsPackage): config_args.append('FC=%s' % self.spec['mpi'].mpifc) config_args.append('F77=%s' % self.spec['mpi'].mpif77) + if '+doc' in self.spec: + config_args.append('--enable-doxygen') + else: + config_args.append('--disable-doxygen') + return config_args @when('@:4.4.5') |