From df36c66730f1087d2014400d140b57e9d3737e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 14 Apr 2021 18:02:33 +0200 Subject: [PATCH] tod: Use dynamically defined version script So we don't have to manage the soname manually --- libfprint/tod/{libfprint-tod.ver => libfprint-tod.ver.in} | 6 +++--- libfprint/tod/meson.build | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) rename libfprint/tod/{libfprint-tod.ver => libfprint-tod.ver.in} (61%) diff --git a/libfprint/tod/libfprint-tod.ver b/libfprint/tod/libfprint-tod.ver.in similarity index 61% rename from libfprint/tod/libfprint-tod.ver rename to libfprint/tod/libfprint-tod.ver.in index 03879411..5b464908 100644 --- a/libfprint/tod/libfprint-tod.ver +++ b/libfprint/tod/libfprint-tod.ver.in @@ -1,15 +1,15 @@ -LIBFPRINT_TOD_1.0.0 { +LIBFPRINT_TOD_@tod_soversion@.0.0 { global: fpi_*; local: *; }; -LIBFPRINT_TOD_1.0.1 { +LIBFPRINT_TOD_@tod_soversion@.0.1 { global: fpi_device_class_auto_initialize_features; fpi_device_get_udev_data; fpi_spi_*; fpi_ssm_spi_*; fpi_ssm_get_device; -} LIBFPRINT_TOD_1.0.0; +} LIBFPRINT_TOD_@tod_soversion@.0.0; diff --git a/libfprint/tod/meson.build b/libfprint/tod/meson.build index 406b69de..d7c6d872 100644 --- a/libfprint/tod/meson.build +++ b/libfprint/tod/meson.build @@ -10,7 +10,11 @@ configure_file(output: 'tod-config.h', configuration: tod_conf) gmodule_dep = dependency('gmodule-2.0', version: '>=' + glib_min_version) deps += gmodule_dep -mapfile = files('libfprint-tod.ver') +mapfile = configure_file(input: 'libfprint-tod.ver.in', + output: 'libfprint-tod.ver', + configuration: { + 'tod_soversion' : tod_soversion, +}) libfprint_tod_private = static_library('fprint-tod-private', sources: [ @@ -34,7 +38,7 @@ libfprint_tod = library(versioned_libname.split('lib')[1] + '-tod', soversion: tod_soversion, include_directories: include_directories('..'), link_args: [ - '-Wl,--version-script,@0@/@1@'.format(meson.source_root(), mapfile[0]), + '-Wl,--version-script,@0@'.format(mapfile), '-Wl,--unresolved-symbols=ignore-in-object-files' ], link_depends: mapfile,