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
This commit is contained in:

committed by
Todd Gamblin

parent
a0195371e8
commit
68baac0549
@@ -25,12 +25,10 @@
|
||||
from spack import *
|
||||
|
||||
|
||||
class Netcdf(Package):
|
||||
class Netcdf(AutotoolsPackage):
|
||||
"""NetCDF is a set of software libraries and self-describing,
|
||||
machine-independent data formats that support the creation, access,
|
||||
and sharing of array-oriented scientific data.
|
||||
|
||||
"""
|
||||
machine-independent data formats that support the creation, access,
|
||||
and sharing of array-oriented scientific data."""
|
||||
|
||||
homepage = "http://www.unidata.ucar.edu/software/netcdf"
|
||||
url = "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.3.3.tar.gz"
|
||||
@@ -82,7 +80,8 @@ def patch(self):
|
||||
ff.filter(r'^(#define\s+NC_MAX_VARS\s+)\d+(.*)$',
|
||||
r'\1{0}\2'.format(max_vars))
|
||||
|
||||
def install(self, spec, prefix):
|
||||
def configure_args(self):
|
||||
spec = self.spec
|
||||
# Workaround until variant forwarding works properly
|
||||
if '+mpi' in spec and spec.satisfies('^hdf5~mpi'):
|
||||
raise RuntimeError('Invalid spec. Package netcdf requires '
|
||||
@@ -95,7 +94,6 @@ def install(self, spec, prefix):
|
||||
LIBS = []
|
||||
|
||||
config_args = [
|
||||
"--prefix=%s" % prefix,
|
||||
"--enable-fsync",
|
||||
"--enable-v2",
|
||||
"--enable-utilities",
|
||||
@@ -168,10 +166,8 @@ def install(self, spec, prefix):
|
||||
config_args.append('LDFLAGS=%s' % ' '.join(LDFLAGS))
|
||||
config_args.append('LIBS=%s' % ' '.join(LIBS))
|
||||
|
||||
configure(*config_args)
|
||||
make()
|
||||
return config_args
|
||||
|
||||
if self.run_tests:
|
||||
make("check")
|
||||
|
||||
make("install")
|
||||
def check(self):
|
||||
# h5_test fails when run in parallel
|
||||
make('check', parallel=False)
|
||||
|
Reference in New Issue
Block a user