zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always External MXML; type='build'

Browse Source 
- always use `mxml` as an external dependency in spack
- declare `build`-only dependencies correctly
This commit is contained in:
Axel Huebl 2016-08-29 23:01:20 +02:00
parent e1464ece55
commit 88254a14a7
No known key found for this signature in database
GPG Key ID: 472D2C364E21D94B
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/adios/package.py
View File

@ -67,14 +67,14 @@ class Adios(Package):
# module load cray-hdf5/1.8.14 # module load cray-hdf5/1.8.14
# module load python/2.7.10 # module load python/2.7.10
depends_on('autoconf') depends_on('autoconf', type='build')
depends_on('automake') depends_on('automake', type='build')
depends_on('libtool') depends_on('libtool', type='build')
depends_on('python') depends_on('python', type='build')
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')
# shipped within ADIOS 1.10.0+ # shipped within ADIOS 1.10.0+
depends_on('mxml', when='@:1.9.0') depends_on('mxml@2.9:')
# optional transformations # optional transformations
depends_on('zlib', when='+zlib') depends_on('zlib', when='+zlib')
depends_on('szip', when='+szip') depends_on('szip', when='+szip')
@ -100,9 +100,8 @@ def install(self, spec, prefix):
# required, otherwise building its python bindings on ADIOS will fail # required, otherwise building its python bindings on ADIOS will fail
extra_args.append("CFLAGS=-fPIC") extra_args.append("CFLAGS=-fPIC")
# MXML is shipped within ADIOS in 1.10.0+ # always build external MXML, even in ADIOS 1.10.0+
if spec.satisfies('@:1.9.0'): extra_args.append('--with-mxml=%s' % spec['mxml'].prefix)
extra_args.append('--with-mxml=%s' % spec['mxml'].prefix)
if '+shared' in spec: if '+shared' in spec:
extra_args.append('--enable-shared') extra_args.append('--enable-shared')