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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 00B00158089 for ; Mon, 25 Sep 2023 23:07:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43E852BC01D; Mon, 25 Sep 2023 23:07:50 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B4AA2BC01D for ; Mon, 25 Sep 2023 23:07:50 +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 01906335CA3 for ; Mon, 25 Sep 2023 23:07:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AC841188 for ; Mon, 25 Sep 2023 23:07:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1695683195.2e918fa5767c83c04b9443f9c77f6ebbf779825a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-23.1.6.ebuild media-libs/mesa/mesa-23.1.7.ebuild media-libs/mesa/mesa-23.1.8.ebuild media-libs/mesa/mesa-23.2.0_rc3.ebuild media-libs/mesa/mesa-23.2.0_rc4.ebuild media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2e918fa5767c83c04b9443f9c77f6ebbf779825a X-VCS-Branch: master Date: Mon, 25 Sep 2023 23:07:47 +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: 836cce1a-1d07-47ca-a727-b9f988081a5e X-Archives-Hash: 26e1310c32249c8c4fa6bbfac5c60188 commit: 2e918fa5767c83c04b9443f9c77f6ebbf779825a Author: Sam James gentoo org> AuthorDate: Mon Sep 25 23:06:35 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Sep 25 23:06:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e918fa5 media-libs/mesa: pass LLVM_MAX_SLOT to get_llvm_prefix for old + missed spot Followup to 5d50956db21f37b3216f09df5149686eb43a76d8. Add it for the intel case, not just opencl, to fix all instances. Backport the change to older ebuilds too. Closes: https://bugs.gentoo.org/914632 Signed-off-by: Sam James gentoo.org> media-libs/mesa/mesa-23.1.6.ebuild | 4 ++-- media-libs/mesa/mesa-23.1.7.ebuild | 4 ++-- media-libs/mesa/mesa-23.1.8.ebuild | 4 ++-- media-libs/mesa/mesa-23.2.0_rc3.ebuild | 4 ++-- media-libs/mesa/mesa-23.2.0_rc4.ebuild | 2 +- media-libs/mesa/mesa-9999.ebuild | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/media-libs/mesa/mesa-23.1.6.ebuild b/media-libs/mesa/mesa-23.1.6.ebuild index 19073addfdf5..5012c2966fd8 100644 --- a/media-libs/mesa/mesa-23.1.6.ebuild +++ b/media-libs/mesa/mesa-23.1.6.ebuild @@ -371,7 +371,7 @@ multilib_src_configure() { fi if use llvm && use opencl; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst emesonargs+=( $(meson_native_true gallium-rusticl) @@ -399,7 +399,7 @@ multilib_src_configure() { emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) if use llvm && use vulkan && use video_cards_intel; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" emesonargs+=(-Dintel-clc=enabled) else emesonargs+=(-Dintel-clc=disabled) diff --git a/media-libs/mesa/mesa-23.1.7.ebuild b/media-libs/mesa/mesa-23.1.7.ebuild index 6036a8c0264b..0eff5117e2be 100644 --- a/media-libs/mesa/mesa-23.1.7.ebuild +++ b/media-libs/mesa/mesa-23.1.7.ebuild @@ -371,7 +371,7 @@ multilib_src_configure() { fi if use llvm && use opencl; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst emesonargs+=( $(meson_native_true gallium-rusticl) @@ -399,7 +399,7 @@ multilib_src_configure() { emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) if use llvm && use vulkan && use video_cards_intel; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" emesonargs+=(-Dintel-clc=enabled) else emesonargs+=(-Dintel-clc=disabled) diff --git a/media-libs/mesa/mesa-23.1.8.ebuild b/media-libs/mesa/mesa-23.1.8.ebuild index 6036a8c0264b..0eff5117e2be 100644 --- a/media-libs/mesa/mesa-23.1.8.ebuild +++ b/media-libs/mesa/mesa-23.1.8.ebuild @@ -371,7 +371,7 @@ multilib_src_configure() { fi if use llvm && use opencl; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst emesonargs+=( $(meson_native_true gallium-rusticl) @@ -399,7 +399,7 @@ multilib_src_configure() { emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) if use llvm && use vulkan && use video_cards_intel; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" emesonargs+=(-Dintel-clc=enabled) else emesonargs+=(-Dintel-clc=disabled) diff --git a/media-libs/mesa/mesa-23.2.0_rc3.ebuild b/media-libs/mesa/mesa-23.2.0_rc3.ebuild index b91c9e4f47da..2cbfe410d4dd 100644 --- a/media-libs/mesa/mesa-23.2.0_rc3.ebuild +++ b/media-libs/mesa/mesa-23.2.0_rc3.ebuild @@ -372,7 +372,7 @@ multilib_src_configure() { fi if use llvm && use opencl; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst emesonargs+=( $(meson_native_true gallium-rusticl) @@ -400,7 +400,7 @@ multilib_src_configure() { emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) if use llvm && use vulkan && use video_cards_intel; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" emesonargs+=(-Dintel-clc=enabled) else emesonargs+=(-Dintel-clc=disabled) diff --git a/media-libs/mesa/mesa-23.2.0_rc4.ebuild b/media-libs/mesa/mesa-23.2.0_rc4.ebuild index aec9de0ef437..02661bf2530d 100644 --- a/media-libs/mesa/mesa-23.2.0_rc4.ebuild +++ b/media-libs/mesa/mesa-23.2.0_rc4.ebuild @@ -395,7 +395,7 @@ multilib_src_configure() { emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) if use llvm && use vulkan && use video_cards_intel; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" emesonargs+=(-Dintel-clc=enabled) else emesonargs+=(-Dintel-clc=disabled) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 8a7607d2aa2e..62cd12fe1eee 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -396,7 +396,7 @@ multilib_src_configure() { emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) if use llvm && use vulkan && use video_cards_intel; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" emesonargs+=(-Dintel-clc=enabled) else emesonargs+=(-Dintel-clc=disabled)