commit:     7231390b4153427af910e9e48f5bda8ff1335d03
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 22:57:11 2026 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 22:22:13 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7231390b

media-libs/mesa: Migrate to llvm-r2.eclass to fix cross-compiling

Mesa can use LLVM as a compiler and/or a library, which llvm-r2_pkg_setup takes
care of now. The rest is the same as before.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/91
Merges: https://codeberg.org/gentoo/gentoo/pulls/91

 media-libs/mesa/mesa-26.0.0.ebuild | 4 ++--
 media-libs/mesa/mesa-9999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-26.0.0.ebuild 
b/media-libs/mesa/mesa-26.0.0.ebuild
index 21888cc886a1..22e6615d51aa 100644
--- a/media-libs/mesa/mesa-26.0.0.ebuild
+++ b/media-libs/mesa/mesa-26.0.0.ebuild
@@ -8,7 +8,7 @@ LLVM_OPTIONAL=1
 CARGO_OPTIONAL=1
 PYTHON_COMPAT=( python3_{11..14} )
 
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info
+inherit flag-o-matic llvm-r2 meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -263,7 +263,7 @@ pkg_setup() {
                linux-info_pkg_setup
        fi
 
-       use llvm && llvm-r1_pkg_setup
+       use llvm && llvm-r2_pkg_setup
        python-any-r1_pkg_setup
 
        if use opencl || (use vulkan && use video_cards_nvk); then

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 21888cc886a1..22e6615d51aa 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -8,7 +8,7 @@ LLVM_OPTIONAL=1
 CARGO_OPTIONAL=1
 PYTHON_COMPAT=( python3_{11..14} )
 
-inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info
+inherit flag-o-matic llvm-r2 meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -263,7 +263,7 @@ pkg_setup() {
                linux-info_pkg_setup
        fi
 
-       use llvm && llvm-r1_pkg_setup
+       use llvm && llvm-r2_pkg_setup
        python-any-r1_pkg_setup
 
        if use opencl || (use vulkan && use video_cards_nvk); then

Reply via email to