diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2024-03-29 09:07:46 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-30 22:25:17 +0000 |
| commit | 22174e5b64cc46e3e5b9f45d0b7796e92f20a48c (patch) | |
| tree | bd6c56e6654248a5fb783f71399b046078dfc5a0 /meta/recipes-graphics/mesa | |
| parent | 8509edeafea8e62e1b9ffe76b33999447f739b20 (diff) | |
| download | openembedded-core-22174e5b64cc46e3e5b9f45d0b7796e92f20a48c.tar.gz | |
mesa: Drop LLVM-17 patch
This patch is no longer needed with llvm/clang 18+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
| -rw-r--r-- | meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 1 |
2 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch deleted file mode 100644 index ceb0153f8d..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3e1e5c475b52651657c906e6b03ee13567cccdd7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 23 Jun 2023 01:20:38 -0700 -Subject: [PATCH] gallium: Fix build with llvm 17 - -These headers are not available for C files in llvm 17+ -and they seem to be not needed to compile after all with llvm 17 -so add conditions to exclude them for llvm >= 17 - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c -index cd2108f..b1a4d03 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_init.c -+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c -@@ -46,15 +46,19 @@ - #if GALLIVM_USE_NEW_PASS == 1 - #include <llvm-c/Transforms/PassBuilder.h> - #elif GALLIVM_HAVE_CORO == 1 -+#if LLVM_VERSION_MAJOR < 17 - #include <llvm-c/Transforms/Scalar.h> --#if LLVM_VERSION_MAJOR >= 7 -+#endif -+#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17 - #include <llvm-c/Transforms/Utils.h> - #endif - #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) - #include <llvm-c/Transforms/IPO.h> - #endif -+#if LLVM_VERSION_MAJOR < 17 - #include <llvm-c/Transforms/Coroutines.h> - #endif -+#endif - - unsigned gallivm_perf = 0; - diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index a8088e6fb6..6e96190084 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -17,7 +17,6 @@ PE = "2" SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ - file://0001-gallium-Fix-build-with-llvm-17.patch \ file://0001-drisw-fix-build-without-dri3.patch \ file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ |