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

h5z-zfp: fix build when ^hdf5+mpi (#29733)

Browse Source
This commit is contained in:
David M. Rogers 2022-03-27 13:50:53 -04:00 committed by GitHub
parent bb9ac2be9c
commit 073330e893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/h5z-zfp/package.py
View File

@ -23,6 +23,7 @@ class H5zZfp(MakefilePackage):
depends_on('hdf5+fortran', when='+fortran') depends_on('hdf5+fortran', when='+fortran')
depends_on('hdf5', when='~fortran') depends_on('hdf5', when='~fortran')
depends_on('mpi', when='^hdf5+mpi')
depends_on('zfp bsws=8') depends_on('zfp bsws=8')
patch('https://github.com/LLNL/H5Z-ZFP/commit/983a1870cefff5fdb643898a14eda855c2c231e4.patch?full_index=1', patch('https://github.com/LLNL/H5Z-ZFP/commit/983a1870cefff5fdb643898a14eda855c2c231e4.patch?full_index=1',
@ -34,14 +35,19 @@ class H5zZfp(MakefilePackage):
@property @property
def make_defs(self): def make_defs(self):
cc = spack_cc
fc = spack_fc
if '^hdf5+mpi' in self.spec:
cc = self.spec['mpi'].mpicc
fc = self.spec['mpi'].mpifc
make_defs = [ make_defs = [
'PREFIX=%s' % prefix, 'PREFIX=%s' % prefix,
'CC=%s' % spack_cc, 'CC=%s' % cc,
'HDF5_HOME=%s' % self.spec['hdf5'].prefix, 'HDF5_HOME=%s' % self.spec['hdf5'].prefix,
'ZFP_HOME=%s' % self.spec['zfp'].prefix] 'ZFP_HOME=%s' % self.spec['zfp'].prefix]
if '+fortran' in self.spec and spack_fc: if '+fortran' in self.spec and fc:
make_defs += ['FC=%s' % spack_fc] make_defs += ['FC=%s' % fc]
else: else:
make_defs += ['FC='] make_defs += ['FC=']