From c65d0775cfb8e035b60f9f762b51c22220526c19 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 18 Apr 2017 14:00:39 +0200 Subject: ADIOS - add bzip2 transport, python patch not applicable to adios 1.9.0 (#3874) --- var/spack/repos/builtin/packages/adios/package.py | 6 ++++-- 1 file 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 -- cgit v1.2.3-70-g09d2