From bed2fd361ce2cbc1ee2fdeb9e590c6483c99321f Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 11 Nov 2022 00:45:56 +0800 Subject: [PATCH] clover: empty soversion when on win32 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7675 Cc: mesa-stable Signed-off-by: Yonggang Luo Reviewed-by: Prodea Alexandru-Liviu Part-of: (cherry picked from commit 14eef1414725692a22fa24e027e8b1fd618d57ed) --- .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 f84e01950c3..c0225ba0f80 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -328,7 +328,7 @@ "description": "clover: empty soversion when on win32", "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 8f9d7ac5a53..6c36244a9d7 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -100,6 +100,7 @@ libopencl = shared_library( dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version ], version : '@0@.0.0'.format(opencl_version), + soversion : host_machine.system() == 'windows' ? '' : opencl_version, install : true, )