|
 |
73b847 |
From 348c1febc17a4d9c7ef13dd3f7ffc396dcac44f4 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
73b847 |
Date: Thu, 5 Dec 2019 14:28:05 +0100
|
|
|
73b847 |
Subject: [PATCH 108/181] meson: Use files to track the map file presence
|
|
|
73b847 |
|
|
|
73b847 |
---
|
|
|
73b847 |
libfprint/meson.build | 6 +++---
|
|
|
73b847 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/libfprint/meson.build b/libfprint/meson.build
|
|
|
73b847 |
index 8cb8609..d3d0fd6 100644
|
|
|
73b847 |
--- a/libfprint/meson.build
|
|
|
73b847 |
+++ b/libfprint/meson.build
|
|
|
73b847 |
@@ -186,9 +186,6 @@ drivers_sources += configure_file(input: 'empty_file',
|
|
|
73b847 |
'\n'.join(drivers_type_list + [] + drivers_type_func)
|
|
|
73b847 |
])
|
|
|
73b847 |
|
|
|
73b847 |
-mapfile = 'libfprint.ver'
|
|
|
73b847 |
-vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
|
|
|
73b847 |
-
|
|
|
73b847 |
deps = [ mathlib_dep, glib_dep, gusb_dep, nss_dep, imaging_dep, gio_dep ]
|
|
|
73b847 |
|
|
|
73b847 |
deps += declare_dependency(include_directories: [
|
|
|
73b847 |
@@ -212,6 +209,9 @@ libfprint_private = static_library('fprint-private',
|
|
|
73b847 |
dependencies: deps,
|
|
|
73b847 |
install: false)
|
|
|
73b847 |
|
|
|
73b847 |
+mapfile = files('libfprint.ver')
|
|
|
73b847 |
+vflag = '-Wl,--version-script,@0@/@1@'.format(meson.source_root(), mapfile[0])
|
|
|
73b847 |
+
|
|
|
73b847 |
libfprint = library('fprint',
|
|
|
73b847 |
sources: libfprint_sources + fp_enums + drivers_sources + other_sources,
|
|
|
73b847 |
soversion: soversion,
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|