mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2025-11-15 07:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Do not use deprecated features in meson

Browse Source
This commit is contained in:
Marco Trevisan (Treviño)
2025-02-20 18:26:44 +01:00
parent db48d1a4e4
commit e401fc10e8
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libfprint/meson.build
View File

@@ -274,8 +274,13 @@ libfprint_drivers = static_library('fprint-drivers',
link_with: libfprint_private, link_with: libfprint_private,
install: false) install: false)
mapfile = files('libfprint.ver') mapfile = files('libfprint.ver')[0]
vflag = '-Wl,--version-script,@0@/@1@'.format(meson.project_source_root(), mapfile[0]) if meson.version().version_compare('>=1.4')
mapfile_path = mapfile.full_path()
else
mapfile_path = meson.project_source_root() / '@0@'.format(mapfile)
endif
vflag = '-Wl,--version-script,@0@'.format(mapfile_path)
libfprint = shared_library(versioned_libname.split('lib')[1], libfprint = shared_library(versioned_libname.split('lib')[1],
sources: [ sources: [

1
meson.build
View File

@@ -32,7 +32,6 @@ glib_min_version = '2.68'
glib_version_def = 'GLIB_VERSION_@0@_@1@'.format( glib_version_def = 'GLIB_VERSION_@0@_@1@'.format(
glib_min_version.split('.')[0], glib_min_version.split('.')[1]) glib_min_version.split('.')[0], glib_min_version.split('.')[1])
common_cflags = cc.get_supported_arguments([ common_cflags = cc.get_supported_arguments([
'-Wall',
'-Wcast-align', '-Wcast-align',
'-Wformat-nonliteral', '-Wformat-nonliteral',
'-Wformat-security', '-Wformat-security',

15
tests/meson.build
View File

@@ -373,10 +373,17 @@ valgrind = find_program('valgrind', required: false)
if valgrind.found() and libfprint_sanitizers.length() == 0 if valgrind.found() and libfprint_sanitizers.length() == 0
glib_share = glib_dep.get_variable(pkgconfig: 'prefix') / 'share' / glib_dep.name() glib_share = glib_dep.get_variable(pkgconfig: 'prefix') / 'share' / glib_dep.name()
glib_suppressions = glib_share + '/valgrind/glib.supp' glib_suppressions = glib_share + '/valgrind/glib.supp'
libfprint_suppressions = '@0@/@1@'.format(meson.project_source_root(), libfprint_suppressions = files('libfprint.supp')[0]
files('libfprint.supp')[0]) python_suppressions = files('valgrind-python.supp')[0]
python_suppressions = '@0@/@1@'.format(meson.project_source_root(),
files('valgrind-python.supp')[0]) if meson.version().version_compare('>=1.4')
libfprint_suppressions = libfprint_suppressions.full_path()
python_suppressions = python_suppressions.full_path()
else
libfprint_suppressions = meson.project_source_root() / '@0@'.format(libfprint_suppressions)
python_suppressions = meson.project_source_root() / '@0@'.format(python_suppressions)
endif
libfprint_wrapper = [ libfprint_wrapper = [
valgrind.full_path(), valgrind.full_path(),
'--tool=memcheck', '--tool=memcheck',