hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ADIOS: Fix Build (Autotools) (#5363)

Browse source 
This fixes the build of the ADIOS package.
The `with_or_without` interface of the Autotools builds
seems to have changed, this fixes it.
This commit is contained in:
Axel Huebl 2017-09-14 19:08:03 +02:00 committed by Massimiliano Culpo
parent 3548e134f7
commit 78894645eb
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
var/spack/repos/builtin/packages/adios/package.py
View file

@ -49,17 +49,26 @@ class Adios(AutotoolsPackage):
variant('fortran', default=False, variant('fortran', default=False,
description='Enable Fortran bindings support') description='Enable Fortran bindings support')
variant('mpi', default=True, description='Enable MPI support') variant('mpi', default=True,
variant('infiniband', default=False, description='Enable infiniband support') description='Enable MPI support')
variant('infiniband', default=False,
description='Enable infiniband support')
# transforms # transforms
variant('zlib', default=True, description='Enable zlib transform support') variant('zlib', default=True,
variant('bzip2', default=False, description='Enable bzip2 transform support') description='Enable zlib transform support')
variant('szip', default=False, description='Enable szip transform support') variant('bzip2', default=False,
variant('zfp', default=True, description='Enable ZFP transform support') description='Enable bzip2 transform support')
variant('sz', default=True, description='Enable SZ transform support') variant('szip', default=False,
description='Enable szip transform support')
variant('zfp', default=True,
description='Enable ZFP transform support')
variant('sz', default=True,
description='Enable SZ transform support')
# transports and serial file converters # transports and serial file converters
variant('hdf5', default=False, description='Enable parallel HDF5 transport and serial bp2h5 converter') variant('hdf5', default=False,
description='Enable parallel HDF5 transport and serial bp2h5 ' +
'converter')
variant('netcdf', default=False, description='Enable netcdf support') variant('netcdf', default=False, description='Enable netcdf support')
variant( variant(
@ -142,7 +151,7 @@ def configure_args(self):
env['MPICC'] = spec['mpi'].mpicc env['MPICC'] = spec['mpi'].mpicc
env['MPICXX'] = spec['mpi'].mpicxx env['MPICXX'] = spec['mpi'].mpicxx
extra_args += self.with_or_without('mpi', activation='prefix') extra_args += self.with_or_without('mpi', activation_value='prefix')
extra_args += self.with_or_without('infiniband') extra_args += self.with_or_without('infiniband')
# Transforms # Transforms
@ -152,7 +161,7 @@ def configure_args(self):
variants += ['hdf5', 'netcdf'] variants += ['hdf5', 'netcdf']
for x in variants: for x in variants:
extra_args += self.with_or_without(x, activation='prefix') extra_args += self.with_or_without(x, activation_value='prefix')
# Staging transports # Staging transports
def with_staging(name): def with_staging(name):
@ -160,6 +169,9 @@ def with_staging(name):
return spec['libevpath'].prefix return spec['libevpath'].prefix
return spec[name].prefix return spec[name].prefix
extra_args += self.with_or_without('staging', activation=with_staging) extra_args += self.with_or_without(
'staging',
activation_value=with_staging
)
return extra_args return extra_args