From 17e4a7219114c743ea7cf34ef8b6f139b3eb2f92 Mon Sep 17 00:00:00 2001 From: Tom Payerle Date: Mon, 25 May 2020 09:15:30 -0400 Subject: netcdf-cxx4: remove erroneous variants (#16762) fixes #16725 The dap, jna, pnetcdf, netcdf4, and ncgen4 variants added in #16047 are _not_ supported by the configure script for netcdf-cxx4 package (These appear to be configure args for netcdf-c package). --- .../repos/builtin/packages/netcdf-cxx4/package.py | 30 ---------------------- 1 file changed, 30 deletions(-) diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py index 3847cc48dd..f49c5d8cce 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py @@ -24,12 +24,7 @@ class NetcdfCxx4(AutotoolsPackage): variant('static', default=True, description='Enable building static libraries') variant('shared', default=True, description='Enable shared library') variant('pic', default=True, description='Produce position-independent code (for shared libs)') - variant('dap', default=False, description='Enable DAP support') - variant('jna', default=False, description='Enable JNA support') variant('doxygen', default=True, description='Enable doxygen docs') - variant('ncgen4', default=True, description='Enable generating netcdf-4 data') - variant('pnetcdf', default=True, description='Enable parallel-netcdf') - variant('netcdf4', default=False, description='Enable netcdf-4 data structure') depends_on('netcdf-c') @@ -75,31 +70,6 @@ class NetcdfCxx4(AutotoolsPackage): else: config_args.append('--without-pic') - if '+dap' in self.spec: - config_args.append('--enable-dap') - else: - config_args.append('--disable-dap') - - if '+jna' in self.spec: - config_args.append('--enable-jna') - else: - config_args.append('--disable-jna') - - if '+pnetcdf' in self.spec: - config_args.append('--enable-pnetcdf') - else: - config_args.append('--disable-pnetcdf') - - if '+netcdf4' in self.spec: - config_args.append('--enable-netcdf-4') - else: - config_args.append('--disable-netcdf-4') - - if '+ncgen4' in self.spec: - config_args.append('--enable-ncgen4') - else: - config_args.append('--disable-ncgen4') - if '+doxygen' in self.spec: config_args.append('--enable-doxygen') else: -- cgit v1.2.3-60-g2f50