From 08130912f07cb47201325796cd4d2321e1ecf533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 17 Jan 2019 23:21:37 +0100 Subject: [PATCH] meson: Set proper soversion and version to libraries Soname of the libraries should be the major version number, while the version triplet is currently used: objdump -p libmutter-4.so.0.0.0 | grep SONAME SONAME libmutter-4.so.0.0.0 While is expected to be only libmutter-4.so.0 Fix all shared libraries by setting valid version and soversion. https://gitlab.gnome.org/GNOME/mutter/merge_requests/3955 --- clutter/clutter/meson.build | 3 ++- cogl/cogl-gles2/meson.build | 3 ++- cogl/cogl-pango/meson.build | 3 ++- cogl/cogl-path/meson.build | 3 ++- cogl/cogl/meson.build | 3 ++- src/meson.build | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index 321792a70..d17dcfb0b 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -519,7 +519,8 @@ libmutter_clutter = shared_library(libmutter_clutter_name, cally_headers, cally_private_headers, ], - soversion: '0.0.0', + version: '0.0.0', + soversion: 0, c_args: clutter_c_args, include_directories: clutter_includes, dependencies: [clutter_deps], diff --git a/cogl/cogl-gles2/meson.build b/cogl/cogl-gles2/meson.build index b83dac74b..40aa242ce 100644 --- a/cogl/cogl-gles2/meson.build +++ b/cogl/cogl-gles2/meson.build @@ -15,7 +15,8 @@ libmutter_cogl_gles2_link_args = [ ] libmutter_cogl_gles2 = shared_library('mutter-cogl-gles2-' + libmutter_api_version, sources: [cogl_gles2_sources, cogl_gles2_public_headers], - soversion: '0.0.0', + version: '0.0.0', + soversion: 0, c_args: cogl_c_args, include_directories: [cogl_includepath, cogl_path_includepath], link_depends: libmutter_cogl_gles2_map, diff --git a/cogl/cogl-pango/meson.build b/cogl/cogl-pango/meson.build index 75bc37c8e..0b2e74858 100644 --- a/cogl/cogl-pango/meson.build +++ b/cogl/cogl-pango/meson.build @@ -28,7 +28,8 @@ libmutter_cogl_pango_link_args = [ ] libmutter_cogl_pango = shared_library('mutter-cogl-pango-' + libmutter_api_version, sources: [cogl_pango_sources, cogl_pango_public_headers], - soversion: '0.0.0', + version: '0.0.0', + soversion: 0, c_args: cogl_c_args, include_directories: [cogl_includepath, cogl_path_includepath], link_depends: libmutter_cogl_pango_map, diff --git a/cogl/cogl-path/meson.build b/cogl/cogl-path/meson.build index b394199f8..d2bbef890 100644 --- a/cogl/cogl-path/meson.build +++ b/cogl/cogl-path/meson.build @@ -59,7 +59,8 @@ libmutter_cogl_path_link_args = [ ] libmutter_cogl_path = shared_library('mutter-cogl-path-' + libmutter_api_version, sources: [cogl_path_sources, cogl_path_public_headers], - soversion: '0.0.0', + version: '0.0.0', + soversion: 0, c_args: cogl_path_c_args, include_directories: [cogl_includepath, cogl_path_includepath], link_depends: libmutter_cogl_path_map, diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build index b06031c96..0fa4194e3 100644 --- a/cogl/cogl/meson.build +++ b/cogl/cogl/meson.build @@ -473,7 +473,8 @@ libmutter_cogl_link_args = [ ] libmutter_cogl = shared_library(libmutter_cogl_name, sources: [cogl_sources, cogl_headers_all], - soversion: '0.0.0', + version: '0.0.0', + soversion: 0, c_args: cogl_c_args, include_directories: cogl_includepath, link_depends: libmutter_cogl_map, diff --git a/src/meson.build b/src/meson.build index 26172b34e..ad4b33370 100644 --- a/src/meson.build +++ b/src/meson.build @@ -742,7 +742,8 @@ libmutter = shared_library(libmutter_name, mutter_sources, mutter_built_sources, ], - soversion: '0.0.0', + version: '0.0.0', + soversion: 0, include_directories: mutter_includes, c_args: mutter_c_args, dependencies: [