PktSurf
9d657e0a1d
Renamed .SMBuild files to smbuild for simplicity Added musl-fts, musl-obstack, glslang, python-glad, libptytty, libmilter, elfutils and fuse to base section build list Discarded fuse2 and fuse3 from base section Temporarily discarded slapt-get, syslinux, p7zip, acpid, libelf-compat, gnu-eif, libtirpc, mozilla-nss, lua53, qpdf, kernel-source and signify from base section build list Disabled nls and made amends to base/e2fsprogs Upgraded base/git to 2.46.2 Upgraded extra/gnumeric to 1.12.57 Disabled nls in base/gnutls, extra/dia Disabled a patch and made amends in base/llvm Fixed configure.local file in base/mandoc Upgraded base/rust to 1.79 Fixed a ton of build files to use build prefix as /usr and miscellaneous changes Discarded extra/bluez,blueman,scrcpy,adafruit-io Added tomb to extra Added new build option to extra/libass Upgraded extra/mpv to 0.37.0 Disabled tests in gtk/gdk-pixbuf Upgraded gtk/goffice to 0.10.57 Added gtk-doc to gtk section Fixed build options in gtk/gtk2 Added new patches to gtk/gtk3 Added gtksourceview to gtk section Added vulkan-headers to xorg section Upgraded xorg/mesa to 23.1.9 Added libplacebo to xorg section Fixed build stuff in xorg/glew
29 lines
933 B
Diff
29 lines
933 B
Diff
upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827
|
|
|
|
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
|
index 24d0823..a7c6c37 100644
|
|
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
|
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
|
@@ -42,8 +42,10 @@
|
|
|
|
#include <llvm/Config/llvm-config.h>
|
|
#include <llvm-c/Analysis.h>
|
|
+#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
|
|
#include <llvm-c/BitWriter.h>
|
|
@@ -53,8 +55,10 @@
|
|
#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;
|
|
|