summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Huebl <axel.huebl@plasma.ninja>2017-09-14 19:08:03 +0200
committerMassimiliano Culpo <massimiliano.culpo@googlemail.com>2017-09-14 19:08:03 +0200
commit78894645eb28455d564252150e86c8772f6c0b12 (patch)
treeaf5b943e1806ae55a57daf4e1386cad5401efa56
parent3548e134f760b85b2b76d5cf3c8c3462f3885852 (diff)
downloadspack-78894645eb28455d564252150e86c8772f6c0b12.tar.gz
spack-78894645eb28455d564252150e86c8772f6c0b12.tar.bz2
spack-78894645eb28455d564252150e86c8772f6c0b12.tar.xz
spack-78894645eb28455d564252150e86c8772f6c0b12.zip
ADIOS: Fix Build (Autotools) (#5363)
This fixes the build of the ADIOS package. The `with_or_without` interface of the Autotools builds seems to have changed, this fixes it.
-rw-r--r--var/spack/repos/builtin/packages/adios/package.py34
1 files changed, 23 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py
index 91188b8e4e..01013958de 100644
--- a/var/spack/repos/builtin/packages/adios/package.py
+++ b/var/spack/repos/builtin/packages/adios/package.py
@@ -49,17 +49,26 @@ class Adios(AutotoolsPackage):
variant('fortran', default=False,
description='Enable Fortran bindings support')
- variant('mpi', default=True, description='Enable MPI support')
- variant('infiniband', default=False, description='Enable infiniband support')
+ variant('mpi', default=True,
+ description='Enable MPI support')
+ variant('infiniband', default=False,
+ description='Enable infiniband support')
# transforms
- variant('zlib', default=True, description='Enable zlib transform support')
- variant('bzip2', default=False, description='Enable bzip2 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')
+ variant('zlib', default=True,
+ description='Enable zlib transform support')
+ variant('bzip2', default=False,
+ description='Enable bzip2 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
- 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(
@@ -142,7 +151,7 @@ class Adios(AutotoolsPackage):
env['MPICC'] = spec['mpi'].mpicc
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')
# Transforms
@@ -152,7 +161,7 @@ class Adios(AutotoolsPackage):
variants += ['hdf5', 'netcdf']
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
def with_staging(name):
@@ -160,6 +169,9 @@ class Adios(AutotoolsPackage):
return spec['libevpath'].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