From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1465155-garchives=archives.gentoo.org@lists.gentoo.org>
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 (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 854AF158020
for <garchives@archives.gentoo.org>; Thu, 8 Dec 2022 16:57:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 03A79E08EC;
Thu, 8 Dec 2022 16:57:20 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 E055DE08EC
for <gentoo-commits@lists.gentoo.org>; Thu, 8 Dec 2022 16:57:19 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CB190335DB0
for <gentoo-commits@lists.gentoo.org>; Thu, 8 Dec 2022 16:57:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4704C7CE
for <gentoo-commits@lists.gentoo.org>; Thu, 8 Dec 2022 16:57:15 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1670518581.a770c62efb886abdfd8fa52fbf312362ab62bf21.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/mesa/mesa-22.3.0.ebuild media-libs/mesa/mesa-9999.ebuild
X-VCS-Directories: media-libs/mesa/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: a770c62efb886abdfd8fa52fbf312362ab62bf21
X-VCS-Branch: master
Date: Thu, 8 Dec 2022 16:57:15 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b3b34b1c-5aa1-43e1-ba48-e4f091fc3de2
X-Archives-Hash: 26e985cfcd64e15cc660ab89842fe73d
commit: a770c62efb886abdfd8fa52fbf312362ab62bf21
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 5 12:39:40 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 8 16:56:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a770c62e
media-libs/mesa: Disable EH/RTTI on LLVM 16+
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28549
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/mesa/mesa-22.3.0.ebuild | 9 +++++++++
media-libs/mesa/mesa-9999.ebuild | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/media-libs/mesa/mesa-22.3.0.ebuild b/media-libs/mesa/mesa-22.3.0.ebuild
index e121c4c2f319..f39169af89a2 100644
--- a/media-libs/mesa/mesa-22.3.0.ebuild
+++ b/media-libs/mesa/mesa-22.3.0.ebuild
@@ -410,6 +410,15 @@ multilib_src_configure() {
use vulkan-overlay && vulkan_layers+=",overlay"
emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+ # In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
+ # to match upstream defaults. Mesa requires being built the same way.
+ # https://bugs.gentoo.org/883955
+ if [[ ${LLVM_SLOT} -ge 16 ]]; then
+ emesonargs+=(
+ -Dcpp_rtti=false
+ )
+ fi
+
emesonargs+=(
$(meson_use test build-tests)
-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e121c4c2f319..f39169af89a2 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -410,6 +410,15 @@ multilib_src_configure() {
use vulkan-overlay && vulkan_layers+=",overlay"
emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+ # In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
+ # to match upstream defaults. Mesa requires being built the same way.
+ # https://bugs.gentoo.org/883955
+ if [[ ${LLVM_SLOT} -ge 16 ]]; then
+ emesonargs+=(
+ -Dcpp_rtti=false
+ )
+ fi
+
emesonargs+=(
$(meson_use test build-tests)
-Dglx=$(usex X dri disabled)