From 44653fa4884c754c7925d5e031fdb9b5f2eec232 Mon Sep 17 00:00:00 2001 From: Alicia Klinvex Date: Tue, 1 Aug 2017 13:05:15 -0400 Subject: [PATCH] Fix xsdk build broken by petsc and trilinos (#4893) * Fix xsdk build broken by petsc and trilinos See #4891 for details * Fix version conflict in trilinos package Trilinos version 11 may conflict with superlu-dist. The version "xsdk-0.2.0" was conflicting with superlu-dist, even though it shouldn't. I added a lower bound to the comparison to fix this problem. Thanks for the help @davydden! --- var/spack/repos/builtin/packages/trilinos/package.py | 2 +- var/spack/repos/builtin/packages/xsdk/package.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 8566adc6491..f69f5bcecb6 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -171,7 +171,7 @@ class Trilinos(CMakePackage): conflicts('+superlu-dist', when='+superlu') # For Trilinos v11 we need to force SuperLUDist=OFF, since only the # deprecated SuperLUDist v3.3 together with an Amesos patch is working. - conflicts('+superlu-dist', when='@:11.14.3') + conflicts('+superlu-dist', when='@11.4.1:11.14.3') # PnetCDF was only added after v12.10.1 conflicts('+pnetcdf', when='@:12.10.1') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 583de80f3a7..4d27b5a79f2 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -53,9 +53,9 @@ class Xsdk(Package): 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', + depends_on('petsc@xsdk-0.2.0+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', when='@xsdk-0.2.0') - depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost', + depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', when='@develop') depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0')