|
 |
73b847 |
From 051549311b5dd44a9b927b2e165cc539699616b2 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: Benjamin Berg <bberg@redhat.com>
|
|
|
73b847 |
Date: Wed, 4 Dec 2019 11:37:30 +0100
|
|
|
73b847 |
Subject: [PATCH 071/181] meson: Build nbis separately to allow changing flags
|
|
|
73b847 |
|
|
|
73b847 |
As nbis is an external source bundle, it does not necessarily make sense
|
|
|
73b847 |
to enable/fix all warnings to the extend we do for our own library code.
|
|
|
73b847 |
|
|
|
73b847 |
As such, separate the build process into multiple stages.
|
|
|
73b847 |
---
|
|
|
73b847 |
libfprint/meson.build | 13 ++++++++++++-
|
|
|
73b847 |
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/libfprint/meson.build b/libfprint/meson.build
|
|
|
73b847 |
index 964744e..7742ecc 100644
|
|
|
73b847 |
--- a/libfprint/meson.build
|
|
|
73b847 |
+++ b/libfprint/meson.build
|
|
|
73b847 |
@@ -183,9 +183,19 @@ 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 |
+nbis_lib = static_library('nbis',
|
|
|
73b847 |
+ nbis_sources,
|
|
|
73b847 |
+ include_directories: [
|
|
|
73b847 |
+ root_inc,
|
|
|
73b847 |
+ include_directories('nbis/include'),
|
|
|
73b847 |
+ ],
|
|
|
73b847 |
+ dependencies: deps,
|
|
|
73b847 |
+ install: false)
|
|
|
73b847 |
+
|
|
|
73b847 |
libfprint = library('fprint',
|
|
|
73b847 |
libfprint_sources + fp_enums + fpi_enums +
|
|
|
73b847 |
- drivers_sources + nbis_sources + other_sources,
|
|
|
73b847 |
+ drivers_sources + other_sources,
|
|
|
73b847 |
soversion: soversion,
|
|
|
73b847 |
version: libversion,
|
|
|
73b847 |
c_args: drivers_cflags,
|
|
|
73b847 |
@@ -195,6 +205,7 @@ libfprint = library('fprint',
|
|
|
73b847 |
],
|
|
|
73b847 |
link_args : vflag,
|
|
|
73b847 |
link_depends : mapfile,
|
|
|
73b847 |
+ link_with: nbis_lib,
|
|
|
73b847 |
dependencies: deps,
|
|
|
73b847 |
install: true)
|
|
|
73b847 |
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|