diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-01-24 22:45:43 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-24 22:45:43 +0000 |
commit | 3f6b99c9f74a0a7bfa2e18f0a7bc7057739cc00b (patch) | |
tree | e56393aac5dcc184833b4e155d45468003757d48 /media-libs/mesa/files | |
parent | b0fd0bc5c186e99078ed8d07146e8c14f1089639 (diff) |
gentoo auto-resync : 24:01:2024 - 22:45:43
Diffstat (limited to 'media-libs/mesa/files')
-rw-r--r-- | media-libs/mesa/files/clang_config_tool.patch | 13 | ||||
-rw-r--r-- | media-libs/mesa/files/clang_resource_dir.patch | 24 |
2 files changed, 0 insertions, 37 deletions
diff --git a/media-libs/mesa/files/clang_config_tool.patch b/media-libs/mesa/files/clang_config_tool.patch deleted file mode 100644 index ed85b9215cdc..000000000000 --- a/media-libs/mesa/files/clang_config_tool.patch +++ /dev/null @@ -1,13 +0,0 @@ -Workaround the CMake dependency lookup returning a different LLVM to llvm-config. - -Bug: https://bugs.gentoo.org/907965 ---- a/meson.build -+++ b/meson.build -@@ -1691,6 +1691,7 @@ if _llvm.allowed() - static : not _shared_llvm, - fallback : ['llvm', 'dep_llvm'], - include_type : 'system', -+ method: 'config-tool', - ) - with_llvm = dep_llvm.found() - endif diff --git a/media-libs/mesa/files/clang_resource_dir.patch b/media-libs/mesa/files/clang_resource_dir.patch deleted file mode 100644 index 6e0c3c7cb745..000000000000 --- a/media-libs/mesa/files/clang_resource_dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 <llvm-c/Target.h> - #include <LLVMSPIRVLib/LLVMSPIRVLib.h> - -+#include <clang/Config/config.h> - #include <clang/Driver/Driver.h> - #include <clang/CodeGen/CodeGenAction.h> - #include <clang/Lex/PreprocessorOptions.h> -@@ -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; |