55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From ceb62d7617a01de49d8e1580f14359972cd545d8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
Date: Fri, 22 Nov 2019 14:09:51 +0100
|
|
Subject: [PATCH 014/181] meson: Avoid repeating the needed glib version
|
|
multiple times
|
|
|
|
Just define once and modify its syntax when needed.
|
|
Use a more verbose definition for the min/max version (instead of just
|
|
join the split version) so that in case we may depend on a specifc glib
|
|
micro release during development.
|
|
---
|
|
meson.build | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 158a2a0..cf277f5 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -18,7 +18,10 @@ libfprint_conf = configuration_data()
|
|
cc = meson.get_compiler('c')
|
|
cpp = meson.get_compiler('cpp')
|
|
host_system = host_machine.system()
|
|
+glib_min_version = '2.50'
|
|
|
|
+glib_version_def = 'GLIB_VERSION_@0@_@1@'.format(
|
|
+ glib_min_version.split('.')[0], glib_min_version.split('.')[1])
|
|
common_cflags = cc.get_supported_arguments([
|
|
'-fgnu89-inline',
|
|
'-std=gnu99',
|
|
@@ -30,8 +33,8 @@ common_cflags = cc.get_supported_arguments([
|
|
'-Werror-implicit-function-declaration',
|
|
'-Wno-pointer-sign',
|
|
'-Wshadow',
|
|
- '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50',
|
|
- '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_50',
|
|
+ '-DGLIB_VERSION_MIN_REQUIRED=' + glib_version_def,
|
|
+ '-DGLIB_VERSION_MAX_ALLOWED=' + glib_version_def,
|
|
])
|
|
|
|
# maintaining compatibility with the previous libtool versioning
|
|
@@ -43,8 +46,8 @@ revision = 0
|
|
libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
|
|
|
|
# Dependencies
|
|
-glib_dep = dependency('glib-2.0', version: '>= 2.50')
|
|
-gio_dep = dependency('gio-unix-2.0', version: '>= 2.44.0')
|
|
+glib_dep = dependency('glib-2.0', version: '>=' + glib_min_version)
|
|
+gio_dep = dependency('gio-unix-2.0', version: '>=' + glib_min_version)
|
|
gusb_dep = dependency('gusb', version: '>= 0.3.0')
|
|
mathlib_dep = cc.find_library('m', required: false)
|
|
|
|
--
|
|
2.24.1
|
|
|