zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Silo: making the HDF5 dependency optional (#22908)

Browse Source
This commit is contained in:
Olivier Cessenat 2021-04-30 03:46:07 +02:00 committed by GitHub
parent cb82e4b088
commit b2d92bbb9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
var/spack/repos/builtin/packages/silo/package.py
View File

@ -27,11 +27,13 @@ class Silo(AutotoolsPackage):
description='Produce position-independent code (for shared libs)')
variant('mpi', default=True,
description='Compile with MPI Compatibility')
variant('hdf5', default=True,
description='Use the HDF5 for database')
depends_on('mpi', when='+mpi')
depends_on('hdf5@:1.10.999', when='@:4.10.2')
depends_on('hdf5~mpi', when='~mpi')
depends_on('hdf5+mpi', when='+mpi')
depends_on('hdf5@:1.10.999', when='@:4.10.2+hdf5')
depends_on('hdf5~mpi', when='~mpi+hdf5')
depends_on('hdf5+mpi', when='+mpi+hdf5')
depends_on('qt+gui~framework@4.8:4.9', when='+silex')
depends_on('libx11', when='+silex')
# Xmu dependency is required on Ubuntu 18-20
@ -45,8 +47,9 @@ class Silo(AutotoolsPackage):
def flag_handler(self, name, flags):
spec = self.spec
if name == 'ldflags':
if spec['hdf5'].satisfies('~shared'):
flags.append('-ldl')
if '+hdf5' in spec:
if spec['hdf5'].satisfies('~shared'):
flags.append('-ldl')
flags.append(spec['readline'].libs.search_flags)
if '+pic' in spec:
@ -94,8 +97,6 @@ def repl(match):
def configure_args(self):
spec = self.spec
config_args = [
'--with-hdf5=%s,%s' % (spec['hdf5'].prefix.include,
spec['hdf5'].prefix.lib),
'--with-zlib=%s,%s' % (spec['zlib'].prefix.include,
spec['zlib'].prefix.lib),
'--enable-install-lite-headers',
@ -104,6 +105,12 @@ def configure_args(self):
'--enable-shared' if '+shared' in spec else '--disable-shared',
]
if '+hdf5' in spec:
config_args.extend([
'--with-hdf5=%s,%s' % (spec['hdf5'].prefix.include,
spec['hdf5'].prefix.lib),
])
if '+silex' in spec:
x = spec['libx11']
config_args.extend([