diff options
| author | Olivier Cessenat <cessenat@gmail.com> | 2021-04-30 03:46:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 18:46:07 -0700 |
| commit | b2d92bbb9f019b8b3437a8532c0cb7b9a2ae2ffe (patch) | |
| tree | 024061a68bef144380696849c36cd6c5f18b1eb7 /var | |
| parent | cb82e4b088bab00fba3594e3fe0c60fe506705fb (diff) | |
| download | spack-b2d92bbb9f019b8b3437a8532c0cb7b9a2ae2ffe.tar.gz spack-b2d92bbb9f019b8b3437a8532c0cb7b9a2ae2ffe.tar.bz2 spack-b2d92bbb9f019b8b3437a8532c0cb7b9a2ae2ffe.tar.xz spack-b2d92bbb9f019b8b3437a8532c0cb7b9a2ae2ffe.zip | |
Silo: making the HDF5 dependency optional (#22908)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/silo/package.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index 3b6f307b02..9fc9ac020b 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -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 @@ class Silo(AutotoolsPackage): 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 @@ class Silo(AutotoolsPackage): '--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([ |