72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
From 01607231c06a2c2adf0eb63f2a49a33e65a2a592 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Watson <twatson52@icloud.com>
|
|
Date: Sat, 30 Nov 2024 15:28:20 -0600
|
|
Subject: [PATCH] opencl.patch from nixpkgs
|
|
abd1d7f93319df76c6fee7aee7ecd39ec6136d62
|
|
|
|
---
|
|
meson.build | 2 +-
|
|
meson_options.txt | 6 ++++++
|
|
src/gallium/targets/opencl/meson.build | 2 +-
|
|
src/gallium/targets/rusticl/meson.build | 2 +-
|
|
4 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index db2e404a3fc..108044b0949 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -1857,7 +1857,7 @@ endif
|
|
|
|
dep_clang = null_dep
|
|
if with_clc or with_gallium_clover
|
|
- llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir')
|
|
+ llvm_libdir = get_option('clang-libdir')
|
|
|
|
dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
|
|
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index 42e819dacd2..78da6e52976 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -29,6 +29,12 @@ option(
|
|
description : 'the window system EGL assumes for EGL_DEFAULT_DISPLAY',
|
|
)
|
|
|
|
+option(
|
|
+ 'clang-libdir',
|
|
+ type : 'string',
|
|
+ value : '',
|
|
+ description : 'Locations to search for clang libraries.'
|
|
+)
|
|
option(
|
|
'android-stub',
|
|
type : 'boolean',
|
|
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
|
|
index ab2c83556a8..a59e88e122f 100644
|
|
--- a/src/gallium/targets/opencl/meson.build
|
|
+++ b/src/gallium/targets/opencl/meson.build
|
|
@@ -56,7 +56,7 @@ if with_opencl_icd
|
|
configuration : _config,
|
|
input : 'mesa.icd.in',
|
|
output : 'mesa.icd',
|
|
- install : true,
|
|
+ install : false,
|
|
install_tag : 'runtime',
|
|
install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
|
|
)
|
|
diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build
|
|
index 2b214adbbf5..7f919397ad5 100644
|
|
--- a/src/gallium/targets/rusticl/meson.build
|
|
+++ b/src/gallium/targets/rusticl/meson.build
|
|
@@ -64,7 +64,7 @@ configure_file(
|
|
configuration : _config,
|
|
input : 'rusticl.icd.in',
|
|
output : 'rusticl.icd',
|
|
- install : true,
|
|
+ install : false,
|
|
install_tag : 'runtime',
|
|
install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
|
|
)
|
|
--
|
|
2.47.0
|
|
|