commit: 00223287044785f94cdc91927c4fc14bf9ae880a Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Aug 28 15:09:39 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Aug 28 15:11:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00223287
media-libs/mesa: Fix build without LLVM Closes: https://bugs.gentoo.org/910435 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/mesa/mesa-23.1.6.ebuild | 6 ++++-- media-libs/mesa/mesa-9999.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/media-libs/mesa/mesa-23.1.6.ebuild b/media-libs/mesa/mesa-23.1.6.ebuild index 66cdcc4c1f78..13f6a8b67de1 100644 --- a/media-libs/mesa/mesa-23.1.6.ebuild +++ b/media-libs/mesa/mesa-23.1.6.ebuild @@ -396,9 +396,11 @@ multilib_src_configure() { use vulkan-overlay && vulkan_layers+=",overlay" emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) - if use vulkan && use video_cards_intel; then + if use llvm && use vulkan && use video_cards_intel; then PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" - emesonargs+=($(meson_feature llvm intel-clc)) + emesonargs+=(-Dintel-clc=enabled) + else + emesonargs+=(-Dintel-clc=disabled) fi emesonargs+=( diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index a595f6d878f8..2079e1c158a7 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -391,9 +391,11 @@ multilib_src_configure() { use vulkan-overlay && vulkan_layers+=",overlay" emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) - if use vulkan && use video_cards_intel; then + if use llvm && use vulkan && use video_cards_intel; then PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" - emesonargs+=($(meson_feature llvm intel-clc)) + emesonargs+=(-Dintel-clc=enabled) + else + emesonargs+=(-Dintel-clc=disabled) fi emesonargs+=(
