Skip to content
Snippets Groups Projects
Commit 5988b3a2 authored by Adam J. Stewart's avatar Adam J. Stewart Committed by Todd Gamblin
Browse files

More specific dependency versions, wrap make check (#1962)

parent 7fd639d6
No related branches found
No related tags found
No related merge requests found
...@@ -39,9 +39,9 @@ class Hdf(Package): ...@@ -39,9 +39,9 @@ class Hdf(Package):
variant('szip', default=False, description="Enable szip support") variant('szip', default=False, description="Enable szip support")
depends_on('jpeg') depends_on('jpeg@6b:')
depends_on('szip', when='+szip') depends_on('szip', when='+szip')
depends_on('zlib') depends_on('zlib@1.1.4:')
depends_on('bison', type='build') depends_on('bison', type='build')
depends_on('flex', type='build') depends_on('flex', type='build')
...@@ -49,9 +49,9 @@ class Hdf(Package): ...@@ -49,9 +49,9 @@ class Hdf(Package):
def install(self, spec, prefix): def install(self, spec, prefix):
config_args = [ config_args = [
'CFLAGS=-fPIC', 'CFLAGS=-fPIC',
'--prefix=%s' % prefix, '--prefix={0}'.format(prefix),
'--with-jpeg=%s' % spec['jpeg'].prefix, '--with-jpeg={0}'.format(spec['jpeg'].prefix),
'--with-zlib=%s' % spec['zlib'].prefix, '--with-zlib={0}'.format(spec['zlib'].prefix),
'--disable-netcdf', # must be disabled to build NetCDF with HDF4 '--disable-netcdf', # must be disabled to build NetCDF with HDF4
'--enable-fortran', '--enable-fortran',
'--disable-shared', # fortran and shared libs are not compatible '--disable-shared', # fortran and shared libs are not compatible
...@@ -59,12 +59,17 @@ def install(self, spec, prefix): ...@@ -59,12 +59,17 @@ def install(self, spec, prefix):
'--enable-production' '--enable-production'
] ]
# SZip support # Szip support
if '+szip' in spec: if '+szip' in spec:
config_args.append('--with-szlib=%s' % spec['szip'].prefix) config_args.append('--with-szlib={0}'.format(spec['szip'].prefix))
else:
config_args.append('--without-szlib')
configure(*config_args) configure(*config_args)
make() make()
make('check')
if self.run_tests:
make('check')
make('install') make('install')
...@@ -60,7 +60,7 @@ class Hdf5(Package): ...@@ -60,7 +60,7 @@ class Hdf5(Package):
depends_on("mpi", when='+mpi') depends_on("mpi", when='+mpi')
depends_on("szip", when='+szip') depends_on("szip", when='+szip')
depends_on("zlib") depends_on("zlib@1.1.2:")
def validate(self, spec): def validate(self, spec):
""" """
...@@ -144,6 +144,10 @@ def install(self, spec, prefix): ...@@ -144,6 +144,10 @@ def install(self, spec, prefix):
"--with-zlib=%s" % spec['zlib'].prefix, "--with-zlib=%s" % spec['zlib'].prefix,
*extra_args) *extra_args)
make() make()
if self.run_tests:
make("check")
make("install") make("install")
self.check_install(spec) self.check_install(spec)
......
...@@ -46,10 +46,10 @@ class Netcdf(Package): ...@@ -46,10 +46,10 @@ class Netcdf(Package):
depends_on("hdf", when='+hdf4') depends_on("hdf", when='+hdf4')
# Required for DAP support # Required for DAP support
depends_on("curl") depends_on("curl@7.18.0:")
# Required for NetCDF-4 support # Required for NetCDF-4 support
depends_on("zlib") depends_on("zlib@1.2.5:")
depends_on('hdf5') depends_on('hdf5')
# NetCDF 4.4.0 and prior have compatibility issues with HDF5 1.10 and later # NetCDF 4.4.0 and prior have compatibility issues with HDF5 1.10 and later
...@@ -105,7 +105,7 @@ def install(self, spec, prefix): ...@@ -105,7 +105,7 @@ def install(self, spec, prefix):
LDFLAGS.append("-L%s/lib" % spec['hdf'].prefix) LDFLAGS.append("-L%s/lib" % spec['hdf'].prefix)
LIBS.append("-l%s" % "jpeg") LIBS.append("-l%s" % "jpeg")
if 'szip' in spec: if '+szip' in spec:
CPPFLAGS.append("-I%s/include" % spec['szip'].prefix) CPPFLAGS.append("-I%s/include" % spec['szip'].prefix)
LDFLAGS.append("-L%s/lib" % spec['szip'].prefix) LDFLAGS.append("-L%s/lib" % spec['szip'].prefix)
LIBS.append("-l%s" % "sz") LIBS.append("-l%s" % "sz")
...@@ -120,4 +120,8 @@ def install(self, spec, prefix): ...@@ -120,4 +120,8 @@ def install(self, spec, prefix):
configure(*config_args) configure(*config_args)
make() make()
if self.run_tests:
make("check")
make("install") make("install")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment