From 76489eb2139bf45bc5340526c9e5c2dd13b33077 Mon Sep 17 00:00:00 2001
From: Sreenivasa Murthy Kolam <67086238+srekolam@users.noreply.github.com>
Date: Tue, 15 Feb 2022 03:59:45 +0530
Subject: replace mesa18 recipe with mesa recipe for the rocm releases (#28491)
---
var/spack/repos/builtin/packages/hip-rocclr/package.py | 2 +-
var/spack/repos/builtin/packages/hip/package.py | 2 +-
var/spack/repos/builtin/packages/rocm-opencl/package.py | 2 +-
var/spack/repos/builtin/packages/rocm-openmp-extras/package.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py
index 20c58ba808..714519e50d 100644
--- a/var/spack/repos/builtin/packages/hip-rocclr/package.py
+++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py
@@ -42,7 +42,7 @@ class HipRocclr(CMakePackage):
variant('build_type', default='Release', values=("Release", "Debug", "RelWithDebInfo"), description='CMake build type')
depends_on('cmake@3:', type='build')
- depends_on('mesa18~llvm@18.3: swr=none', type='link')
+ depends_on('mesa~llvm@21: swr=none', type='link')
depends_on('libelf', type='link', when="@3.7.0:3.8.0")
depends_on('numactl', type='link', when="@3.7.0:")
diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py
index b0e19373d4..f22de204f4 100644
--- a/var/spack/repos/builtin/packages/hip/package.py
+++ b/var/spack/repos/builtin/packages/hip/package.py
@@ -37,7 +37,7 @@ class Hip(CMakePackage):
depends_on('cmake@3:', type='build')
depends_on('perl@5.10:', type=('build', 'run'))
- depends_on('mesa18~llvm@18.3:')
+ depends_on('mesa~llvm@21:')
for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0',
'4.2.0', '4.3.0', '4.3.1']:
diff --git a/var/spack/repos/builtin/packages/rocm-opencl/package.py b/var/spack/repos/builtin/packages/rocm-opencl/package.py
index 93bab94feb..1ea2f7f2d3 100644
--- a/var/spack/repos/builtin/packages/rocm-opencl/package.py
+++ b/var/spack/repos/builtin/packages/rocm-opencl/package.py
@@ -38,7 +38,7 @@ class RocmOpencl(CMakePackage):
variant('build_type', default='Release', values=("Release", "Debug", "RelWithDebInfo"), description='CMake build type')
depends_on('cmake@3:', type='build')
- depends_on('mesa18~llvm@18.3:', type='link')
+ depends_on('mesa~llvm@21:', type='link')
depends_on('numactl', type='link', when='@3.7.0:')
for d_version, d_shasum in [
diff --git a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py
index 576a0f8fd7..e2abfaa6af 100644
--- a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py
+++ b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py
@@ -105,7 +105,7 @@ class RocmOpenmpExtras(Package):
version('3.9.0', sha256=versions_dict['3.9.0']['aomp'])
depends_on('cmake@3:', type='build')
- depends_on('mesa18~llvm@18.3:', type=('build', 'link'))
+ depends_on('mesa~llvm@21:', type=('build', 'link'))
depends_on('py-setuptools', type='build')
depends_on('python@3:', type='build')
depends_on('perl-data-dumper', type='build')
--
cgit v1.2.3-70-g09d2