From: Karel Zak <kzak@redhat.com>
Date: Tue, 22 Nov 2022 11:11:07 +0000 (+0100)
Subject: meson: update to build new libmount
X-Git-Tag: v2.39-rc1~226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e23c3262b9025ac2374156188a8aaf6c951672e5;p=thirdparty%2Futil-linux.git

meson: update to build new libmount

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/meson.build b/libmount/meson.build
index 1367ab291e..4764fcd70f 100644
--- a/libmount/meson.build
+++ b/libmount/meson.build
@@ -38,17 +38,20 @@ lib_mount_sources = '''
 
 if LINUX
   lib_mount_sources += '''
-    src/context.c
-    src/context_loopdev.c
-    src/context_veritydev.c
-    src/context_mount.c
-    src/context_umount.c
-    src/hook_mount_legacy.c
-    src/hook_mkdir.c
+    src/hooks.c
+    src/monitor.c
+    src/optlist.c
+    src/hook_veritydev.c
     src/hook_subdir.c
     src/hook_owner.c
+    src/hook_mount.c
+    src/hook_mount_legacy.c
+    src/hook_mkdir.c
+    src/hook_loopdev.c
     src/hook_idmap.c
-    src/monitor.c
+    src/context_umount.c
+    src/context_mount.c
+    src/context.c
 '''.split()
 endif
 
diff --git a/meson.build b/meson.build
index 694f6f3814..c1ff7605d1 100644
--- a/meson.build
+++ b/meson.build
@@ -77,9 +77,14 @@ build_libuuid = not get_option('build-libuuid').disabled()
 conf.set('HAVE_LIBUUID', build_libuuid ? 1 : false)
 summary('libuuid', build_libuuid ? 'enabled' : 'disabled', section : 'components')
 
+have_mountfd_api = cc.sizeof('struct mount_attr', prefix : '#include <linux/mount.h>') > 0
+conf.set('HAVE_STRUCT_MOUNT_ATTR', have_mountfd_api ? 1 : false)
+conf.set('HAVE_MOUNTFD_API', have_mountfd_api ? 1 : false)
+
 build_libmount = not get_option('build-libmount').disabled()
 conf.set('HAVE_LIBMOUNT', build_libmount ? 1 : false)
 conf.set('USE_LIBMOUNT_SUPPORT_NAMESPACES', 1)
+conf.set('USE_LIBMOUNT_MOUNTFD_SUPPORT', have_mountfd_api ? 1 : false)
 summary('libmount', build_libmount ? 'enabled' : 'disabled', section : 'components')
 
 build_libsmartcols = not get_option('build-libsmartcols').disabled()
@@ -589,11 +594,9 @@ have = cc.has_member('struct tm', 'tm_gmtoff',
 conf.set('HAVE_TM_GMTOFF', have ? 1 : false)
 
 
-have = cc.sizeof('struct mount_attr', prefix : '#include <linux/mount.h>') > 0
-conf.set('HAVE_STRUCT_MOUNT_ATTR', have ? 1 : false)
 
 have = cc.sizeof('enum fsconfig_command', prefix : '#include <linux/mount.h>') > 0
-conf.set('HAVE_ENUM_FSCONFIG_COMMANS', have ? 1 : false)
+conf.set('HAVE_ENUM_FSCONFIG_COMMAND', have ? 1 : false)
 
 have = cc.has_member('struct termios', 'c_line',
                      prefix : '#include <termios.h>')