commit: f3caa4db8e65ccf767a5b0b893ca3a28c1e39bea Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sat Jan 4 19:53:34 2025 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Jan 4 20:03:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3caa4db
media-libs/mesa: Workaround multilib build failure Closes: https://bugs.gentoo.org/939803 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/mesa/mesa-24.2.8.ebuild | 11 ++++++++++- media-libs/mesa/mesa-24.3.2.ebuild | 11 ++++++++++- media-libs/mesa/mesa-9999.ebuild | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/media-libs/mesa/mesa-24.2.8.ebuild b/media-libs/mesa/mesa-24.2.8.ebuild index 83d5147a4b1c..4e9ede781732 100644 --- a/media-libs/mesa/mesa-24.2.8.ebuild +++ b/media-libs/mesa/mesa-24.2.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -476,6 +476,15 @@ multilib_src_configure() { fi } +multilib_src_compile() { + if [[ ${ABI} == x86 ]]; then + # Bug 939803 + BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile + else + meson_src_compile + fi +} + multilib_src_test() { meson_src_test -t 100 } diff --git a/media-libs/mesa/mesa-24.3.2.ebuild b/media-libs/mesa/mesa-24.3.2.ebuild index 11cf7cc6900c..7846e415a4f5 100644 --- a/media-libs/mesa/mesa-24.3.2.ebuild +++ b/media-libs/mesa/mesa-24.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -471,6 +471,15 @@ multilib_src_configure() { fi } +multilib_src_compile() { + if [[ ${ABI} == x86 ]]; then + # Bug 939803 + BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile + else + meson_src_compile + fi +} + multilib_src_test() { meson_src_test -t 100 } diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 11cf7cc6900c..7846e415a4f5 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -471,6 +471,15 @@ multilib_src_configure() { fi } +multilib_src_compile() { + if [[ ${ABI} == x86 ]]; then + # Bug 939803 + BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile + else + meson_src_compile + fi +} + multilib_src_test() { meson_src_test -t 100 }
