forked from brl/citadel
Bruce Leidl
4831a46764
Recipes updated: adwaita-icon-theme 43 --> 46.0 cairomm 1.12.0 --> 1.18 gdm 42.0 --> 45.0 glibmm 2.62.0 --> 2.78.0 gjs 1.77.90 --> 1.80.0 gnome-backgrounds 45.0 --> 46.0 gnome-bluetooth 42.4 --> 46.0 gnome-control-center 45.0 --> 46.0 gnome-disk-utility 42.0 --> 46.0 gnome-session 42.0 --> 46.0 gnome-settings-daemon 45.0 --> 46.0 gnome-shell 45.0 --> 46.0 gnome-system-monitor 42.0 --> 46.0 gsettings-desktop-schemas 45.0 --> 46.0 gtk4 4.12.1 --> 4.14.1 gvfs 1.50.2 --> 1.54.0 libadwaita 1.4.0 --> 1.5.0 libgtop 2.40.0 --> 2.41.3 libgweather4 4.2.0 --> 4.4.2 libwacom 0.26 --> 2.8.0 mutter 45.0 --> 46.0 pangomm 2.46.2 --> 2.50.1 New recipes added: pipewire 1.0.4 wireplumber 0.5.0 doxygen 1.9.3 gcr 4.2.0 rtkit 0.13 libopus 1.5.1 libjxl 0.10.2 wayland gtkmm4 4.14.0
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
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;
|
|
|