From f02de6de85c5c120e30607fdf15527fc0714f3dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Thu, 30 Dec 2021 16:30:14 +0100 Subject: [PATCH] meson: headers: use util-linux version of version defines MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This matches what autotools is doing. Signed-off-by: Thomas Weißschuh --- libblkid/meson.build | 6 +++++- libfdisk/meson.build | 8 ++++---- libmount/meson.build | 8 ++++---- libsmartcols/meson.build | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/libblkid/meson.build b/libblkid/meson.build index a38462c2ea..ff1a78dfc4 100644 --- a/libblkid/meson.build +++ b/libblkid/meson.build @@ -1,9 +1,13 @@ dir_libblkid = include_directories('.', 'src') +defs = configuration_data() +defs.set('LIBBLKID_DATE', libblkid_date) +defs.set('LIBBLKID_VERSION', pc_version) + blkid_h = configure_file( input : 'src/blkid.h.in', output : 'blkid.h', - configuration : conf) + configuration : defs) lib_blkid_sources = ''' src/blkidP.h diff --git a/libfdisk/meson.build b/libfdisk/meson.build index 7e17485811..b5989bd970 100644 --- a/libfdisk/meson.build +++ b/libfdisk/meson.build @@ -1,10 +1,10 @@ dir_libfdisk = include_directories('.', 'src') defs = configuration_data() -defs.set('LIBFDISK_VERSION', libfdisk_version) -defs.set('LIBFDISK_MAJOR_VERSION', libfdisk_version.split('.')[0]) -defs.set('LIBFDISK_MINOR_VERSION', libfdisk_version.split('.')[1]) -defs.set('LIBFDISK_PATCH_VERSION', libfdisk_version.split('.')[2]) +defs.set('LIBFDISK_VERSION', pc_version) +defs.set('LIBFDISK_MAJOR_VERSION', pc_version.split('.')[0]) +defs.set('LIBFDISK_MINOR_VERSION', pc_version.split('.')[1]) +defs.set('LIBFDISK_PATCH_VERSION', pc_version.split('.')[2]) libfdisk_h = configure_file( input : 'src/libfdisk.h.in', diff --git a/libmount/meson.build b/libmount/meson.build index d25ec8d08c..0a7a972dfc 100644 --- a/libmount/meson.build +++ b/libmount/meson.build @@ -1,10 +1,10 @@ dir_libmount = include_directories('.', 'src') defs = configuration_data() -defs.set('LIBMOUNT_VERSION', libmount_version) -defs.set('LIBMOUNT_MAJOR_VERSION', libmount_version.split('.')[0]) -defs.set('LIBMOUNT_MINOR_VERSION', libmount_version.split('.')[1]) -defs.set('LIBMOUNT_PATCH_VERSION', libmount_version.split('.')[2]) +defs.set('LIBMOUNT_VERSION', pc_version) +defs.set('LIBMOUNT_MAJOR_VERSION', pc_version.split('.')[0]) +defs.set('LIBMOUNT_MINOR_VERSION', pc_version.split('.')[1]) +defs.set('LIBMOUNT_PATCH_VERSION', pc_version.split('.')[2]) libmount_h = configure_file( input : 'src/libmount.h.in', diff --git a/libsmartcols/meson.build b/libsmartcols/meson.build index 47113092b9..b59f41bf90 100644 --- a/libsmartcols/meson.build +++ b/libsmartcols/meson.build @@ -1,7 +1,7 @@ dir_libsmartcols = include_directories('.', 'src') defs = configuration_data() -defs.set('LIBSMARTCOLS_VERSION', libsmartcols_version) +defs.set('LIBSMARTCOLS_VERSION', pc_version) libsmartcols_h = configure_file( input : 'src/libsmartcols.h.in', -- 2.47.3