summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Huebl <axel.huebl@plasma.ninja>2016-08-29 23:01:20 +0200
committerAxel Huebl <axel.huebl@plasma.ninja>2016-08-29 23:01:20 +0200
commit88254a14a7b45efcfbe12496cb6f68fe0d2156ae (patch)
tree26f08e06d57b3b5654621d0a56e7b4fb7b0dbfb2
parente1464ece55198065b7801e18dfedc9eab2e07286 (diff)
downloadspack-88254a14a7b45efcfbe12496cb6f68fe0d2156ae.tar.gz
spack-88254a14a7b45efcfbe12496cb6f68fe0d2156ae.tar.bz2
spack-88254a14a7b45efcfbe12496cb6f68fe0d2156ae.tar.xz
spack-88254a14a7b45efcfbe12496cb6f68fe0d2156ae.zip
Always External MXML; type='build'
- always use `mxml` as an external dependency in spack - declare `build`-only dependencies correctly
-rw-r--r--var/spack/repos/builtin/packages/adios/package.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py
index eda7a7e2ac..7babf85b29 100644
--- a/var/spack/repos/builtin/packages/adios/package.py
+++ b/var/spack/repos/builtin/packages/adios/package.py
@@ -67,14 +67,14 @@ class Adios(Package):
# module load cray-hdf5/1.8.14
# module load python/2.7.10
- depends_on('autoconf')
- depends_on('automake')
- depends_on('libtool')
- depends_on('python')
+ depends_on('autoconf', type='build')
+ depends_on('automake', type='build')
+ depends_on('libtool', type='build')
+ depends_on('python', type='build')
depends_on('mpi', when='+mpi')
# shipped within ADIOS 1.10.0+
- depends_on('mxml', when='@:1.9.0')
+ depends_on('mxml@2.9:')
# optional transformations
depends_on('zlib', when='+zlib')
depends_on('szip', when='+szip')
@@ -100,9 +100,8 @@ class Adios(Package):
# required, otherwise building its python bindings on ADIOS will fail
extra_args.append("CFLAGS=-fPIC")
- # MXML is shipped within ADIOS in 1.10.0+
- if spec.satisfies('@:1.9.0'):
- extra_args.append('--with-mxml=%s' % spec['mxml'].prefix)
+ # always build external MXML, even in ADIOS 1.10.0+
+ extra_args.append('--with-mxml=%s' % spec['mxml'].prefix)
if '+shared' in spec:
extra_args.append('--enable-shared')