From 63f5aee69443049926e9e853daac7be79a87dcbe Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 10 Jul 2018 11:09:27 -0700 Subject: [PATCH] meson: maintain names of shared API libraries Mesa uses the lib prefix, and doesn't use a version for it's dynamic libraries, which meson defaults to. v2: - this patch Acked-by: Eric Engestrom Acked-by: Kristian H. Kristensen --- src/mapi/es1api/meson.build | 2 ++ src/mapi/es2api/meson.build | 2 ++ src/mapi/shared-glapi/meson.build | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build index 79f37970790..9d97dd67c40 100644 --- a/src/mapi/es1api/meson.build +++ b/src/mapi/es1api/meson.build @@ -47,7 +47,9 @@ libglesv1_cm = shared_library( include_directories : [inc_src, inc_include, inc_mapi], link_with : libglapi, dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl], + soversion : host_machine.system() == 'windows' ? '' : '1', version : '1.1.0', + name_prefix : 'lib', install : true, ) diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build index 4be142e846d..cb7bd41ad42 100644 --- a/src/mapi/es2api/meson.build +++ b/src/mapi/es2api/meson.build @@ -47,7 +47,9 @@ libgles2 = shared_library( include_directories : [inc_src, inc_include, inc_mapi], link_with : libglapi, dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl], + soversion : host_machine.system() == 'windows' ? '' : '2', version : '2.0.0', + name_prefix : 'lib', install : true, ) diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build index ea97e1b9437..7d0fe115d63 100644 --- a/src/mapi/shared-glapi/meson.build +++ b/src/mapi/shared-glapi/meson.build @@ -55,7 +55,9 @@ libglapi = shared_library( link_args : [ld_args_gc_sections], include_directories : [inc_src, inc_include, inc_mapi], dependencies : [dep_thread, dep_selinux], + soversion : host_machine.system() == 'windows' ? '' : '0', version : '0.0.0', + name_prefix : 'lib', install : true, ) -- 2.30.2