diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-05-22 21:53:30 +0200 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-22 20:57:58 +0100 |
| commit | 6f59d0f387dd62f12a7107e898064c7e42159945 (patch) | |
| tree | 6ecea57882b4f6c49a9b368ad90f7c470485580f | |
| parent | 58442456e6736fbe0d46d55bf32acba881aad853 (diff) | |
| download | pango-6f59d0f387dd62f12a7107e898064c7e42159945.tar.gz | |
meson: Generate correct sonames
"soversion:" is for the version placed in the soname. The full library
revision goes into "version:". This affects the symlinks, too.
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | pango/meson.build | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 1a0ff0e4..368f3317 100644 --- a/meson.build +++ b/meson.build @@ -37,7 +37,8 @@ pango_conf.set('PANGO_VERSION_MINOR', pango_minor_version) pango_conf.set('PANGO_VERSION_MICRO', pango_micro_version) # Maintain version scheme with libtool -pango_soversion = '0.@0@.@1@'.format((pango_binary_age - pango_interface_age), pango_interface_age) +pango_soversion = 0 +pango_libversion = '@0@.@1@.@2@'.format(pango_soversion, (pango_binary_age - pango_interface_age), pango_interface_age) cc = meson.get_compiler('c') host_system = host_machine.system() diff --git a/pango/meson.build b/pango/meson.build index e238db03..0a1101f6 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -92,6 +92,7 @@ pango_inc = include_directories('.') libpango = shared_library('pango-@0@'.format(pango_api_version), sources: pango_sources + pango_enums, + version: pango_libversion, soversion: pango_soversion, install: true, dependencies: [ gobject_dep, mathlib_dep, thai_dep, mini_fribidi_dep ], @@ -157,6 +158,7 @@ if freetype_dep.found() libpangoft2 = shared_library('pangoft2-@0@'.format(pango_api_version), sources: pangoft2_sources + [ pango_enum_h ], + version: pango_libversion, soversion: pango_soversion, install: true, dependencies: pango_deps + [ libpango_dep ], @@ -207,6 +209,7 @@ if xft_dep.found() libpangoxft = shared_library('pangoxft-@0@'.format(pango_api_version), sources: pangoxft_sources + [ pango_enum_h ], + version: pango_libversion, soversion: pango_soversion, install: true, dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ], @@ -264,6 +267,7 @@ if host_system == 'windows' libpangowin32 = shared_library('pangowin32-@0@'.format(pango_api_version), sources: pangowin32_sources + [ pango_enum_h ], + version: pango_libversion, soversion: pango_soversion, install: true, dependencies: pangowin32_deps, @@ -330,6 +334,7 @@ if cairo_dep.found() libpangocairo = shared_library('pangocairo-@0@'.format(pango_api_version), sources: pangocairo_sources + [ pango_enum_h ], + version: pango_libversion, soversion: pango_soversion, install: true, dependencies: pango_deps + pangocairo_deps, |