From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D801F15813A for ; Sat, 04 Jan 2025 20:08:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87EDBE0718; Sat, 04 Jan 2025 20:08:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C3C5E070D for ; Sat, 04 Jan 2025 20:08:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A06A340836 for ; Sat, 04 Jan 2025 20:08:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 909C118E7 for ; Sat, 04 Jan 2025 20:08:21 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1736021015.f3caa4db8e65ccf767a5b0b893ca3a28c1e39bea.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-24.2.8.ebuild media-libs/mesa/mesa-24.3.2.ebuild media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f3caa4db8e65ccf767a5b0b893ca3a28c1e39bea X-VCS-Branch: master Date: Sat, 04 Jan 2025 20:08:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 78aaf29a-d60b-464d-867c-ecb84d124968 X-Archives-Hash: d892fcdaf4f91f48e81ba5a5b0cfee39 commit: f3caa4db8e65ccf767a5b0b893ca3a28c1e39bea Author: Matt Turner gentoo org> AuthorDate: Sat Jan 4 19:53:34 2025 +0000 Commit: Matt Turner gentoo 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 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 }