summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorSeth R. Johnson <johnsonsr@ornl.gov>2021-07-20 15:13:25 -0400
committerGitHub <noreply@github.com>2021-07-20 15:13:25 -0400
commit2fd24f8542cf62e456c904aa39045ed57f1060c8 (patch)
treeb60bc5045ec69d60660de917f5a2650444d19e14 /var
parentc1567463b095074d9bc685f04281c8101082fcd9 (diff)
downloadspack-2fd24f8542cf62e456c904aa39045ed57f1060c8.tar.gz
spack-2fd24f8542cf62e456c904aa39045ed57f1060c8.tar.bz2
spack-2fd24f8542cf62e456c904aa39045ed57f1060c8.tar.xz
spack-2fd24f8542cf62e456c904aa39045ed57f1060c8.zip
trilinos: fix boost variant/dependency error for minitensor (#24985)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py4
1 files changed, 3 insertions, 1 deletions
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