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 3FADF158649 for ; Fri, 12 May 2023 17:19:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B8B2E07F2; Fri, 12 May 2023 17:19:00 +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 2C0DBE07F2 for ; Fri, 12 May 2023 17:19:00 +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 3F8CC340D41 for ; Fri, 12 May 2023 17:18:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B7D5A6D for ; Fri, 12 May 2023 17:18:56 +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: <1683911922.1423ea88c441acee76b8687096a862a697646df1.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/, media-libs/mesa/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/files/clang_resource_dir.patch media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ media-libs/mesa/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 1423ea88c441acee76b8687096a862a697646df1 X-VCS-Branch: master Date: Fri, 12 May 2023 17:18:56 +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: eccefbf5-9f2e-48e3-86d7-bed0324e569f X-Archives-Hash: d267022c86e00a4ca74ba8a83d4d30b8 commit: 1423ea88c441acee76b8687096a862a697646df1 Author: Niccolò Belli linuxsystems it> AuthorDate: Wed Apr 12 07:05:43 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri May 12 17:18:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1423ea88 media-libs/mesa: workaround hardcoded clang directory Closes: https://github.com/gentoo/gentoo/pull/28209 Signed-off-by: Niccolò Belli linuxsystems.it> Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/files/clang_resource_dir.patch | 24 ++++++++++++++++++++++++ media-libs/mesa/mesa-9999.ebuild | 5 +++++ 2 files changed, 29 insertions(+) diff --git a/media-libs/mesa/files/clang_resource_dir.patch b/media-libs/mesa/files/clang_resource_dir.patch new file mode 100644 index 000000000000..6e0c3c7cb745 --- /dev/null +++ b/media-libs/mesa/files/clang_resource_dir.patch @@ -0,0 +1,24 @@ +https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19232#note_1776640 +https://gitlab.freedesktop.org/mesa/mesa/-/issues/7717#note_1832122 + +diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp +index 80bc84831e4..34d156bf227 100644 +--- a/src/compiler/clc/clc_helpers.cpp ++++ b/src/compiler/clc/clc_helpers.cpp +@@ -39,6 +39,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -866,7 +867,7 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx, + // because we might have linked clang statically. + auto libclang_path = fs::path(LLVM_LIB_DIR) / "libclang.so"; + auto clang_res_path = +- fs::path(clang::driver::Driver::GetResourcesPath(libclang_path.string())) / "include"; ++ fs::path(clang::driver::Driver::GetResourcesPath(libclang_path.string(), CLANG_RESOURCE_DIR)) / "include"; + + c->getHeaderSearchOpts().UseBuiltinIncludes = true; + c->getHeaderSearchOpts().UseStandardSystemIncludes = true; diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index ca386dd38126..80d191b25459 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -172,6 +172,11 @@ llvm_check_deps() { has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]" } +PATCHES=( + # Temporary rusticl workaround: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7717#note_1832122 + "${FILESDIR}/clang_resource_dir.patch" +) + pkg_pretend() { if use vulkan; then if ! use video_cards_d3d12 &&