mirror of
git://slackware.nl/current.git
synced 2025-02-14 08:48:37 +01:00
e77612ed71
l/SDL3-3.2.0-x86_64-1.txz: Added. l/gst-plugins-bad-free-1.24.12-x86_64-1.txz: Upgraded. l/gst-plugins-base-1.24.12-x86_64-1.txz: Upgraded. l/gst-plugins-good-1.24.12-x86_64-1.txz: Upgraded. l/gst-plugins-libav-1.24.12-x86_64-1.txz: Upgraded. l/gstreamer-1.24.12-x86_64-1.txz: Upgraded. l/libplacebo-7.349.0-x86_64-3.txz: Rebuilt. Patched and recompiled against vulkan-sdk-1.4.304.0. x/vulkan-sdk-1.4.304.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. testing/packages/aaa_glibc-solibs-2.41-x86_64-1.txz: Added. testing/packages/glibc-2.41-x86_64-1.txz: Added. This breaks dhcpcd's privsep, and probably some other stuff. Nothing else in /testing is compiled against glibc-2.41. Also upgraded to libxcrypt-4.4.38. testing/packages/glibc-i18n-2.41-x86_64-1.txz: Added. testing/packages/glibc-profile-2.41-x86_64-1.txz: Added. testing/packages/mesa-25.0.0_rc1-x86_64-1.txz: Added. The radeonsi workaround patch was removed, even though it did still apply. Let me know if the stalls return...
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From 72566fd92c27b39abe2057f6f23388ec40793dd9 Mon Sep 17 00:00:00 2001
|
|
From: Jesse Natalie <jenatali@microsoft.com>
|
|
Date: Wed, 18 Nov 2020 18:28:49 -0800
|
|
Subject: [PATCH] clover: Support LLVM coming from CMake instead of config-tool
|
|
|
|
Reviewed-by: Karol Herbst <kherbst@redhat.com>
|
|
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
|
|
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7680>
|
|
---
|
|
src/gallium/frontends/clover/meson.build | 2 +-
|
|
src/gallium/targets/opencl/meson.build | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build
|
|
index 95a100d005c..b946eefff37 100644
|
|
--- a/src/gallium/frontends/clover/meson.build
|
|
+++ b/src/gallium/frontends/clover/meson.build
|
|
@@ -71,7 +71,7 @@ libclllvm = static_library(
|
|
clover_opencl_cpp_args,
|
|
clover_spirv_cpp_args,
|
|
'-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths(
|
|
- dep_llvm.get_configtool_variable('libdir'), 'clang',
|
|
+ dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir'), 'clang',
|
|
dep_llvm.version(), 'include',
|
|
)),
|
|
],
|
|
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
|
|
index dedd8ab7647..e758e4c12d9 100644
|
|
--- a/src/gallium/targets/opencl/meson.build
|
|
+++ b/src/gallium/targets/opencl/meson.build
|
|
@@ -29,7 +29,7 @@ if with_ld_version_script
|
|
opencl_link_deps += files('opencl.sym')
|
|
endif
|
|
|
|
-llvm_libdir = dep_llvm.get_configtool_variable('libdir')
|
|
+llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir')
|
|
opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL'
|
|
|
|
polly_dep = null_dep
|
|
--
|
|
GitLab
|
|
|