summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAlicia Klinvex <amklinv@sandia.gov>2017-06-14 14:56:24 -0400
committerAdam J. Stewart <ajstewart426@gmail.com>2017-06-14 13:56:24 -0500
commitf732598f516d8a61c3e15b61fccf3dd7ee8fbadc (patch)
tree00df0dae0882609d26c63ee160faad92841df1f3 /var
parentdaa5cf7e73d34b89cbc223d9477f32a77d0b0e9f (diff)
downloadspack-f732598f516d8a61c3e15b61fccf3dd7ee8fbadc.tar.gz
spack-f732598f516d8a61c3e15b61fccf3dd7ee8fbadc.tar.bz2
spack-f732598f516d8a61c3e15b61fccf3dd7ee8fbadc.tar.xz
spack-f732598f516d8a61c3e15b61fccf3dd7ee8fbadc.zip
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
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/xsdk/package.py4
1 files 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',