summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Olesen <Mark.Olesen@gmx.net>2017-04-18 14:00:39 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2017-04-18 07:00:39 -0500
commitc65d0775cfb8e035b60f9f762b51c22220526c19 (patch)
treecbdc013a1f5bacabf939de400212d5c71a5fce18
parentd17b5eb2b9f7e2b481171a624a0c05803d05a685 (diff)
downloadspack-c65d0775cfb8e035b60f9f762b51c22220526c19.tar.gz
spack-c65d0775cfb8e035b60f9f762b51c22220526c19.tar.bz2
spack-c65d0775cfb8e035b60f9f762b51c22220526c19.tar.xz
spack-c65d0775cfb8e035b60f9f762b51c22220526c19.zip
ADIOS - add bzip2 transport, python patch not applicable to adios 1.9.0 (#3874)
-rw-r--r--var/spack/repos/builtin/packages/adios/package.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py
index 840f1be518..e55274277d 100644
--- a/var/spack/repos/builtin/packages/adios/package.py
+++ b/var/spack/repos/builtin/packages/adios/package.py
@@ -53,6 +53,7 @@ class Adios(AutotoolsPackage):
# 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=False, description='Enable ZFP transform support')
# transports and serial file converters
@@ -72,6 +73,7 @@ class Adios(AutotoolsPackage):
depends_on('mxml@2.9:')
# optional transformations
depends_on('zlib', when='+zlib')
+ depends_on('bzip2', when='+bzip2')
depends_on('szip', when='+szip')
depends_on('zfp@:0.5.0', when='+zfp')
# optional transports & file converters
@@ -80,8 +82,8 @@ class Adios(AutotoolsPackage):
build_directory = 'spack-build'
# ADIOS uses the absolute Python path, which is too long and results in
- # "bad interpreter" errors
- patch('python.patch')
+ # "bad interpreter" errors - but not applicable for 1.9.0
+ patch('python.patch', when='@1.10.0:')
# Fix ADIOS <=1.10.0 compile error on HDF5 1.10+
# https://github.com/ornladios/ADIOS/commit/3b21a8a41509
# https://github.com/LLNL/spack/issues/1683