hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dealii: remove bzip2 dependency for newer versions (#6022)

Browse source
This commit is contained in:
Denis Davydov 2017-10-29 14:39:51 +01:00 committed by Christoph Junghans
parent 56c7832789
commit f6a8ae230e
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
var/spack/repos/builtin/packages/dealii/package.py
View file

@ -111,7 +111,8 @@ class Dealii(CMakePackage):
when='@8.5.0:~mpi+python') when='@8.5.0:~mpi+python')
depends_on("boost@1.59.0:1.63,1.66:+thread+system+serialization+iostreams+mpi+python", depends_on("boost@1.59.0:1.63,1.66:+thread+system+serialization+iostreams+mpi+python",
when='@8.5.0:+mpi+python') when='@8.5.0:+mpi+python')
depends_on("bzip2") # bzip2 is not needed since 9.0
depends_on("bzip2", when='@:8.99')
depends_on("lapack") depends_on("lapack")
depends_on("muparser") depends_on("muparser")
depends_on("suite-sparse") depends_on("suite-sparse")
@ -174,10 +175,6 @@ def cmake_args(self):
'-DDEAL_II_COMPONENT_EXAMPLES=ON', '-DDEAL_II_COMPONENT_EXAMPLES=ON',
'-DDEAL_II_WITH_THREADS:BOOL=ON', '-DDEAL_II_WITH_THREADS:BOOL=ON',
'-DBOOST_DIR=%s' % spec['boost'].prefix, '-DBOOST_DIR=%s' % spec['boost'].prefix,
# Cmake may still pick up system's bzip2, fix this:
'-DBZIP2_FOUND=true',
'-DBZIP2_INCLUDE_DIRS=%s' % spec['bzip2'].prefix.include,
'-DBZIP2_LIBRARIES=%s' % spec['bzip2'].libs.joined(';'),
# CMake's FindBlas/Lapack may pickup system's blas/lapack instead # CMake's FindBlas/Lapack may pickup system's blas/lapack instead
# of Spack's. Be more specific to avoid this. # of Spack's. Be more specific to avoid this.
# Note that both lapack and blas are provided in -DLAPACK_XYZ. # Note that both lapack and blas are provided in -DLAPACK_XYZ.
@ -191,6 +188,14 @@ def cmake_args(self):
'-DZLIB_DIR=%s' % spec['zlib'].prefix '-DZLIB_DIR=%s' % spec['zlib'].prefix
]) ])
if spec.satisfies('@:8.99'):
options.extend([
# Cmake may still pick up system's bzip2, fix this:
'-DBZIP2_FOUND=true',
'-DBZIP2_INCLUDE_DIRS=%s' % spec['bzip2'].prefix.include,
'-DBZIP2_LIBRARIES=%s' % spec['bzip2'].libs.joined(';')
])
# Set recommended flags for maximum (matrix-free) performance, see # Set recommended flags for maximum (matrix-free) performance, see
# https://groups.google.com/forum/?fromgroups#!topic/dealii/3Yjy8CBIrgU # https://groups.google.com/forum/?fromgroups#!topic/dealii/3Yjy8CBIrgU
if spec.satisfies('%gcc'): if spec.satisfies('%gcc'):