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

dealii: workaround for concretization bug (#4735)

Browse Source 
* dealii: workaround for concretization bug

* trilinos: add Anasazi which got disabled recently
This commit is contained in:
Denis Davydov 2017-07-13 14:51:45 +02:00 committed by Adam J. Stewart
parent 1ecb389dcb
commit 92e6616a8a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/dealii/package.py
View File

@ -113,8 +113,8 @@ class Dealii(CMakePackage):
depends_on("hdf5+mpi", when='+hdf5+mpi') depends_on("hdf5+mpi", when='+hdf5+mpi')
# FIXME: concretizer bug. The two lines mimic what comes from PETSc # FIXME: concretizer bug. The two lines mimic what comes from PETSc
# but we should not need it # but we should not need it
depends_on("metis@5:+int64", when='+metis+int64') depends_on("metis@5:+int64+real64", when='+metis+int64')
depends_on("metis@5:~int64", when='+metis~int64') depends_on("metis@5:~int64+real64", when='+metis~int64')
depends_on("netcdf+mpi", when="+netcdf+mpi") depends_on("netcdf+mpi", when="+netcdf+mpi")
depends_on("netcdf-cxx", when='+netcdf+mpi') depends_on("netcdf-cxx", when='+netcdf+mpi')
depends_on("oce", when='+oce') depends_on("oce", when='+oce')

4
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -123,6 +123,8 @@ class Trilinos(CMakePackage):
description='Compile with Amesos') description='Compile with Amesos')
variant('amesos2', default=True, variant('amesos2', default=True,
description='Compile with Amesos2') description='Compile with Amesos2')
variant('anasazi', default=True,
description='Compile with Anasazi')
variant('ifpack', default=True, variant('ifpack', default=True,
description='Compile with Ifpack') description='Compile with Ifpack')
variant('ifpack2', default=True, variant('ifpack2', default=True,
@ -305,6 +307,8 @@ def cmake_args(self):
'ON' if '+gtest' in spec else 'OFF'), 'ON' if '+gtest' in spec else 'OFF'),
'-DTrilinos_ENABLE_Teuchos:BOOL=%s' % ( '-DTrilinos_ENABLE_Teuchos:BOOL=%s' % (
'ON' if '+teuchos' in spec else 'OFF'), 'ON' if '+teuchos' in spec else 'OFF'),
'-DTrilinos_ENABLE_Anasazi:BOOL=%s' % (
'ON' if '+anasazi' in spec else 'OFF'),
]) ])
if '+xsdkflags' in spec: if '+xsdkflags' in spec: