[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/

["Sam James" <sam@gentoo.org>]

commit:     7319ff722dbb79d4b8b1a93154bea3b7fdcb0a7b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 00:32:08 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 24 00:32:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7319ff72

media-libs/mesa: filter LTO for GCC 14

chutzpah reported crashes with Firefox after building mesa (and the
rest of his system) with GCC 14. Disabling LTO on Mesa seems to have
fixed it, which tallies with an upstream bug I'd spotted the other day.

Unfortunately, the testsuite fails the same way before/after (but
just in one silly known test) so can't use that to nail it further.

Bug: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/mesa/{mesa-9999.ebuild => mesa-24.1.0-r1.ebuild} | 5 ++++-
 media-libs/mesa/mesa-9999.ebuild                            | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-24.1.0-r1.ebuild
similarity index 98%
copy from media-libs/mesa/mesa-9999.ebuild
copy to media-libs/mesa/mesa-24.1.0-r1.ebuild
index f9c4e1acfcbb..a2c38124b0e8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-24.1.0-r1.ebuild
@@ -7,7 +7,7 @@ LLVM_COMPAT=( {15..17} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain
+inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs
 
 MY_P="${P/_/-}"
 
@@ -290,6 +290,9 @@ src_prepare() {
 multilib_src_configure() {
 	local emesonargs=()
 
+	# https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
+	tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto
+
 	local platforms
 	use X && platforms+="x11"
 	use wayland && platforms+=",wayland"

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f9c4e1acfcbb..a2c38124b0e8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -7,7 +7,7 @@ LLVM_COMPAT=( {15..17} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain
+inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs
 
 MY_P="${P/_/-}"
 
@@ -290,6 +290,9 @@ src_prepare() {
 multilib_src_configure() {
 	local emesonargs=()
 
+	# https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
+	tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto
+
 	local platforms
 	use X && platforms+="x11"
 	use wayland && platforms+=",wayland"