pyrox.dev
mesa: simplify opencl patch
+10
-41
pkgs/development/libraries/mesa/opencl.patch
+10
-41
pkgs/development/libraries/mesa/opencl.patch
···
1
diff --git a/meson.build b/meson.build
2
-
index e32338b3f9a..fae804fd41e 100644
3
--- a/meson.build
4
+++ b/meson.build
5
-
@@ -1894,7 +1894,7 @@ endif
6
7
dep_clang = null_dep
8
if with_clc
···
29
'platforms',
30
type : 'array',
31
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
32
-
index 7af210b5693..ff6ac8c61ca 100644
33
--- a/src/gallium/targets/opencl/meson.build
34
+++ b/src/gallium/targets/opencl/meson.build
35
-
@@ -30,6 +30,7 @@ if with_ld_version_script
36
endif
37
38
-
llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir')
39
+clang_libdir = get_option('clang-libdir')
40
-
opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL'
41
42
-
polly_dep = null_dep
43
-
@@ -60,19 +61,19 @@ else
44
-
endif
45
-
if not _shared_llvm or not (dep_clang.found() and dep_clang_usable)
46
-
dep_clang = [
47
-
- cpp.find_library('clangCodeGen', dirs : llvm_libdir),
48
-
- cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
49
-
- cpp.find_library('clangFrontend', dirs : llvm_libdir),
50
-
- cpp.find_library('clangDriver', dirs : llvm_libdir),
51
-
- cpp.find_library('clangSerialization', dirs : llvm_libdir),
52
-
- cpp.find_library('clangParse', dirs : llvm_libdir),
53
-
- cpp.find_library('clangSema', dirs : llvm_libdir),
54
-
- cpp.find_library('clangAnalysis', dirs : llvm_libdir),
55
-
- cpp.find_library('clangAST', dirs : llvm_libdir),
56
-
- cpp.find_library('clangASTMatchers', dirs : llvm_libdir),
57
-
- cpp.find_library('clangEdit', dirs : llvm_libdir),
58
-
- cpp.find_library('clangLex', dirs : llvm_libdir),
59
-
- cpp.find_library('clangBasic', dirs : llvm_libdir),
60
-
+ cpp.find_library('clangCodeGen', dirs : clang_libdir),
61
-
+ cpp.find_library('clangFrontendTool', dirs : clang_libdir),
62
-
+ cpp.find_library('clangFrontend', dirs : clang_libdir),
63
-
+ cpp.find_library('clangDriver', dirs : clang_libdir),
64
-
+ cpp.find_library('clangSerialization', dirs : clang_libdir),
65
-
+ cpp.find_library('clangParse', dirs : clang_libdir),
66
-
+ cpp.find_library('clangSema', dirs : clang_libdir),
67
-
+ cpp.find_library('clangAnalysis', dirs : clang_libdir),
68
-
+ cpp.find_library('clangAST', dirs : clang_libdir),
69
-
+ cpp.find_library('clangASTMatchers', dirs : clang_libdir),
70
-
+ cpp.find_library('clangEdit', dirs : clang_libdir),
71
-
+ cpp.find_library('clangLex', dirs : clang_libdir),
72
-
+ cpp.find_library('clangBasic', dirs : clang_libdir),
73
-
polly_dep, polly_isl_dep,
74
-
]
75
-
# check clang once more
76
-
@@ -119,7 +120,7 @@ if with_opencl_icd
77
configuration : _config,
78
input : 'mesa.icd.in',
79
output : 'mesa.icd',
···
1
diff --git a/meson.build b/meson.build
2
+
index 172c64a7c70..05961e56926 100644
3
--- a/meson.build
4
+++ b/meson.build
5
+
@@ -1900,7 +1900,7 @@ endif
6
7
dep_clang = null_dep
8
if with_clc
···
29
'platforms',
30
type : 'array',
31
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
32
+
index db3586bd7fb..4d914206d21 100644
33
--- a/src/gallium/targets/opencl/meson.build
34
+++ b/src/gallium/targets/opencl/meson.build
35
+
@@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0')
36
+
polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false)
37
endif
38
39
+
-dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
40
+clang_libdir = get_option('clang-libdir')
41
+
+dep_clang = cpp.find_library('clang-cpp', dirs : clang_libdir, required : false)
42
43
+
# meson will return clang-cpp from system dirs if it's not found in llvm_libdir
44
+
linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir)
45
+
@@ -123,7 +124,7 @@ if with_opencl_icd
46
configuration : _config,
47
input : 'mesa.icd.in',
48
output : 'mesa.icd',