diff options
Diffstat (limited to 'modules/nixos/features/nvk/opencl.patch')
| -rw-r--r-- | modules/nixos/features/nvk/opencl.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/modules/nixos/features/nvk/opencl.patch b/modules/nixos/features/nvk/opencl.patch deleted file mode 100644 index c820700..0000000 --- a/modules/nixos/features/nvk/opencl.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/meson.build b/meson.build -index e4570c5..80203cc 100644 ---- a/meson.build -+++ b/meson.build -@@ -1797,7 +1797,7 @@ endif - - dep_clang = null_dep - if with_clc -- 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 3d8425f..fa7c913 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,6 +1,13 @@ - # Copyright © 2017-2019 Intel Corporation - # SPDX-License-Identifier: MIT - -+option( -+ 'clang-libdir', -+ type : 'string', -+ value : '', -+ description : 'Locations to search for clang libraries.' -+) -+ - option( - 'platforms', - type : 'array', -diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index 7c14135..74dc685 100644 ---- a/src/gallium/targets/opencl/meson.build -+++ b/src/gallium/targets/opencl/meson.build -@@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0') - polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false) - endif - --dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) -+clang_libdir = get_option('clang-libdir') -+dep_clang = cpp.find_library('clang-cpp', dirs : clang_libdir, required : false) - - # meson will return clang-cpp from system dirs if it's not found in llvm_libdir - linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir) -@@ -123,7 +124,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 8205ed7..a11b700 100644 ---- a/src/gallium/targets/rusticl/meson.build -+++ b/src/gallium/targets/rusticl/meson.build -@@ -75,7 +75,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'), - ) |
