From 2fd24f8542cf62e456c904aa39045ed57f1060c8 Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Tue, 20 Jul 2021 15:13:25 -0400 Subject: trilinos: fix boost variant/dependency error for minitensor (#24985) --- var/spack/repos/builtin/packages/trilinos/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 85dafa076f..9531118f3c 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -337,6 +337,9 @@ class Trilinos(CMakePackage, CudaPackage): conflicts('cxxstd=14', when='+wrapper ^cuda@6.5.14:8.0.61') conflicts('cxxstd=17', when='+wrapper ^cuda@6.5.14:10.2.89') + # Boost requires minitensor + conflicts('~boost', when='+minitensor') + # SCOREC requires shards, stk, and zoltan conflicts('+scorec', when='~mpi') conflicts('+scorec', when='~shards') @@ -375,7 +378,6 @@ class Trilinos(CMakePackage, CudaPackage): depends_on('parmetis', when='+scorec') depends_on('cgns', when='+cgns') depends_on('adios2', when='+adios2') - depends_on('boost', when='+minitensor') # Trilinos' Tribits config system is limited which makes it very tricky to # link Amesos with static MUMPS, see # https://trilinos.org/docs/dev/packages/amesos2/doc/html/classAmesos2_1_1MUMPS.html -- cgit v1.2.3-70-g09d2