media-libs/mesa: Reenable RTTI for LLVM 16+

It turned out that disabling RTTI to match upstream defaults causes
more breakage, so we're returning to the previous state of enabling it
in Gentoo.

Closes: https://bugs.gentoo.org/900503
Closes: https://bugs.gentoo.org/884193
Signed-off-by: Michał Górny <mgorny@gentoo.org>

9 files changed, 0 insertions, 81 deletions

diff --git a/media-libs/mesa/mesa-22.3.2.ebuild b/media-libs/mesa/mesa-22.3.2.ebuild
index eb3f9e101cf3..c9007bcc3ef8 100644
--- a/media-libs/mesa/mesa-22.3.2.ebuild
+++ b/media-libs/mesa/mesa-22.3.2.ebuild
@@ -410,15 +410,6 @@ 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-22.3.3.ebuild b/media-libs/mesa/mesa-22.3.3.ebuild
index eb3f9e101cf3..c9007bcc3ef8 100644
--- a/media-libs/mesa/mesa-22.3.3.ebuild
+++ b/media-libs/mesa/mesa-22.3.3.ebuild
@@ -410,15 +410,6 @@ 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-22.3.5.ebuild b/media-libs/mesa/mesa-22.3.5.ebuild
index e85c95eeb1ec..f53a757e471d 100644
--- a/media-libs/mesa/mesa-22.3.5.ebuild
+++ b/media-libs/mesa/mesa-22.3.5.ebuild
@@ -408,15 +408,6 @@ 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-22.3.6.ebuild b/media-libs/mesa/mesa-22.3.6.ebuild
index a9ba50b52c7e..ff6a0226d392 100644
--- a/media-libs/mesa/mesa-22.3.6.ebuild
+++ b/media-libs/mesa/mesa-22.3.6.ebuild
@@ -408,15 +408,6 @@ 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-22.3.7-r1.ebuild b/media-libs/mesa/mesa-22.3.7-r1.ebuild
index f998fdcc64bf..06b88a6fdeca 100644
--- a/media-libs/mesa/mesa-22.3.7-r1.ebuild
+++ b/media-libs/mesa/mesa-22.3.7-r1.ebuild
@@ -408,15 +408,6 @@ 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-23.0.0-r1.ebuild b/media-libs/mesa/mesa-23.0.0-r1.ebuild
index f998fdcc64bf..06b88a6fdeca 100644
--- a/media-libs/mesa/mesa-23.0.0-r1.ebuild
+++ b/media-libs/mesa/mesa-23.0.0-r1.ebuild
@@ -408,15 +408,6 @@ 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-23.0.0_rc3.ebuild b/media-libs/mesa/mesa-23.0.0_rc3.ebuild
index e85c95eeb1ec..f53a757e471d 100644
--- a/media-libs/mesa/mesa-23.0.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-23.0.0_rc3.ebuild
@@ -408,15 +408,6 @@ 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-23.0.0_rc4.ebuild b/media-libs/mesa/mesa-23.0.0_rc4.ebuild
index e85c95eeb1ec..f53a757e471d 100644
--- a/media-libs/mesa/mesa-23.0.0_rc4.ebuild
+++ b/media-libs/mesa/mesa-23.0.0_rc4.ebuild
@@ -408,15 +408,6 @@ 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 f998fdcc64bf..06b88a6fdeca 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -408,15 +408,6 @@ 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)