diff options
| author | Denis Davydov <davydden@gmail.com> | 2017-07-13 14:51:45 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-07-13 07:51:45 -0500 |
| commit | 92e6616a8ab9a579aa9feee79809113228ec5c91 (patch) | |
| tree | 3662f2701dc1d44ec653cb574321865f6a3e78ee | |
| parent | 1ecb389dcbd768db85619adbf849139fbe7e191c (diff) | |
| download | spack-92e6616a8ab9a579aa9feee79809113228ec5c91.tar.gz spack-92e6616a8ab9a579aa9feee79809113228ec5c91.tar.bz2 spack-92e6616a8ab9a579aa9feee79809113228ec5c91.tar.xz spack-92e6616a8ab9a579aa9feee79809113228ec5c91.zip | |
dealii: workaround for concretization bug (#4735)
* dealii: workaround for concretization bug
* trilinos: add Anasazi which got disabled recently
| -rw-r--r-- | var/spack/repos/builtin/packages/dealii/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 51d851b9b1..ba1f896010 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -113,8 +113,8 @@ class Dealii(CMakePackage): depends_on("hdf5+mpi", when='+hdf5+mpi') # FIXME: concretizer bug. The two lines mimic what comes from PETSc # but we should not need it - depends_on("metis@5:+int64", when='+metis+int64') - depends_on("metis@5:~int64", when='+metis~int64') + depends_on("metis@5:+int64+real64", when='+metis+int64') + depends_on("metis@5:~int64+real64", when='+metis~int64') depends_on("netcdf+mpi", when="+netcdf+mpi") depends_on("netcdf-cxx", when='+netcdf+mpi') depends_on("oce", when='+oce') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 3c9940792d..f3d1f61111 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -123,6 +123,8 @@ class Trilinos(CMakePackage): description='Compile with Amesos') variant('amesos2', default=True, description='Compile with Amesos2') + variant('anasazi', default=True, + description='Compile with Anasazi') variant('ifpack', default=True, description='Compile with Ifpack') variant('ifpack2', default=True, @@ -305,6 +307,8 @@ class Trilinos(CMakePackage): 'ON' if '+gtest' in spec else 'OFF'), '-DTrilinos_ENABLE_Teuchos:BOOL=%s' % ( 'ON' if '+teuchos' in spec else 'OFF'), + '-DTrilinos_ENABLE_Anasazi:BOOL=%s' % ( + 'ON' if '+anasazi' in spec else 'OFF'), ]) if '+xsdkflags' in spec: |