Module: Mesa Branch: staging/22.3 Commit: 2074706b3fa51a931424f3faf7dea1364ad55dbf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2074706b3fa51a931424f3faf7dea1364ad55dbf
Author: Yonggang Luo <[email protected]> Date: Wed Nov 9 11:24:32 2022 +0800 meson: Fixes name_prefix for clover on mingw Cc: mesa-stable Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19610> (cherry picked from commit 67627c84a71b4c795efa6ddcffa5633ce0239f65) --- .pick_status.json | 2 +- src/gallium/targets/opencl/meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 72c374c25de..abd31ef46d3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -157,7 +157,7 @@ "description": "meson: Fixes name_prefix for clover on mingw", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build index 89629ded9ba..676f04f32a7 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -105,6 +105,7 @@ libopencl = shared_library( idep_mesautil, dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version ], + name_prefix : host_machine.system() == 'windows' ? '' : 'lib', # otherwise mingw will create libOpenCL-1.dll or libMesaOpenCL-1.dll version : '@[email protected]'.format(opencl_version), install : true, )
