[Mesa-dev] [PATCH 3/3] meson: Version libMesaOpenCL like autotools does

Aaron Watry awatry at gmail.com
Mon Apr 16 15:08:26 UTC 2018


Yes, please.

Fixes clover platform and device detection when installed in
/usr/local/ using ocl-icd for me when building with meson. I think
that was the last thing blocking me from switching over from autotools
on the rest of my machines.

Not familiar enough with the versioning/linking in meson, but you can
definitely have a:
Tested-By: Aaron Watry <awatry at gmail.com>

--Aaron

On Sat, Apr 14, 2018 at 12:23 PM, Jan Alexander Steffens (heftig)
<jan.steffens at gmail.com> wrote:
> This is for parity with autotools. It names the library
> libMesaOpenCL.so.1.0.0 and points mesa.icd to the .1 symlink.
>
> opencl_version now matches configure.ac's OPENCL_VERSION.
>
> Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
> ---
>  src/gallium/targets/opencl/meson.build | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
> index bebe0547d4..317ad8dab4 100644
> --- a/src/gallium/targets/opencl/meson.build
> +++ b/src/gallium/targets/opencl/meson.build
> @@ -20,7 +20,7 @@
>
>  opencl_link_args = []
>  opencl_link_deps = []
> -opencl_version = '1.0'
> +opencl_version = '1'
>
>  if with_ld_version_script
>    opencl_link_args += [
> @@ -55,7 +55,7 @@ libopencl = shared_library(
>      cpp.find_library('clangLex', dirs : llvm_libdir),
>      cpp.find_library('clangBasic', dirs : llvm_libdir),
>    ],
> -  version : opencl_version,
> +  version : '@0 at .0.0'.format(opencl_version),
>    install : true,
>  )
>
> --
> 2.16.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list