From f732598f516d8a61c3e15b61fccf3dd7ee8fbadc Mon Sep 17 00:00:00 2001 From: Alicia Klinvex Date: Wed, 14 Jun 2017 14:56:24 -0400 Subject: Fix tpetra-related xsdk errors (#4501) * Fix tpetra-related xsdk errors Recent changes to the trilinos package broke the xsdk build. xSDK explicitly disables tpetra, but packages depending on it (such as ifpack2 and amesos2) are explicitly enabled by default in the trilinos package. This commit explicitly disables them within the xsdk package.py. * Disabled exodus in the xsdk build See issue #4502 for details --- var/spack/repos/builtin/packages/xsdk/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 22a873bca8..735aedbe45 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -48,9 +48,9 @@ class Xsdk(Package): depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0') depends_on('superlu-dist@develop', when='@develop') - depends_on('trilinos@xsdk-0.2.0+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra', + depends_on('trilinos@xsdk-0.2.0+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@xsdk-0.2.0') - depends_on('trilinos@develop+xsdkflags+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra', + depends_on('trilinos@develop+xsdkflags+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@develop') depends_on('petsc@xsdk-0.2.0+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost', -- cgit v1.2.3-70-g09d2