From 27c0b4a0f704dab4283a82334d278cf714f84abc Mon Sep 17 00:00:00 2001
From: Olivier Cessenat <cessenat@gmail.com>
Date: Mon, 27 Sep 2021 19:58:54 +0200
Subject: sundials package: @:5.7.0 requires hypre@:2.22.0 (#25903)

sundials@:5.7.0 fails to build with hypre@2.22.1
---
 var/spack/repos/builtin/packages/sundials/package.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py
index d409ae36c8..63f2f0c78f 100644
--- a/var/spack/repos/builtin/packages/sundials/package.py
+++ b/var/spack/repos/builtin/packages/sundials/package.py
@@ -174,21 +174,22 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
     depends_on('raja+rocm', when='+raja +rocm')
 
     # External libraries
-    depends_on('lapack',              when='+lapack')
-    depends_on('suite-sparse',        when='+klu')
-    depends_on('petsc+mpi',           when='+petsc')
-    depends_on('hypre+mpi',           when='+hypre')
-    depends_on('superlu-dist@6.1.1:', when='@:5.4.0 +superlu-dist')
-    depends_on('superlu-dist@6.3.0:', when='@5.5.0: +superlu-dist')
-    depends_on('trilinos+tpetra',     when='+trilinos')
+    depends_on('lapack',                  when='+lapack')
+    depends_on('suite-sparse',            when='+klu')
+    depends_on('petsc+mpi',               when='+petsc')
+    depends_on('hypre+mpi~int64',         when='@5.7.1: +hypre ~int64')
+    depends_on('hypre+mpi+int64',         when='@5.7.1: +hypre +int64')
+    depends_on('hypre@:2.22.0+mpi~int64', when='@:5.7.0 +hypre ~int64')
+    depends_on('hypre@:2.22.0+mpi+int64', when='@:5.7.0 +hypre +int64')
+    depends_on('superlu-dist@6.1.1:',     when='@:5.4.0 +superlu-dist')
+    depends_on('superlu-dist@6.3.0:',     when='@5.5.0: +superlu-dist')
+    depends_on('trilinos+tpetra',         when='+trilinos')
 
     # Require that external libraries built with the same precision
     depends_on('petsc~double~complex', when='+petsc precision=single')
     depends_on('petsc+double~complex', when='+petsc precision=double')
 
     # Require that external libraries built with the same index type
-    depends_on('hypre~int64', when='+hypre ~int64')
-    depends_on('hypre+int64', when='+hypre +int64')
     depends_on('petsc~int64', when='+petsc ~int64')
     depends_on('petsc+int64', when='+petsc +int64')
     depends_on('superlu-dist+int64', when='+superlu-dist +int64')
-- 
cgit v1.2.3-70-g09d2