Merge branch 'PR/libsmartcols-cell-data' of github.com:karelzak/util-linux-work

[thirdparty/util-linux.git] / meson.build

diff --git a/meson.build b/meson.build
index 0ce570cbd7fa05a0f252dcf2c27930cda3eb1eca..74cf366ae265b6d57ca0ac87858ab37ac7e26cb7 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,11 @@
 project('util-linux', 'c',
         version : run_command('tools/git-version-gen', check: true).stdout(),
-        meson_version: '>=0.57.0',
-        license : 'GPLv2+')
+        meson_version: '>=0.60.0',
+        license : 'GPLv2+',
+        default_options : [
+          'c_std=c99',
+          'cpp_std=c++11',
+        ])
 
 fs = import('fs')
 pkgconfig = import('pkgconfig')
@@ -172,6 +176,7 @@ headers = '''
        linux/fiemap.h
        linux/gsmmux.h
         linux/if_alg.h
+        linux/landlock.h
         linux/kcmp.h
         linux/net_namespace.h
         linux/nsfs.h
@@ -535,6 +540,9 @@ funcs = '''
         getsgnam
         inotify_init
         jrand48
+        landlock_create_ruleset
+        landlock_add_rule
+        landlock_restrict_self
         lchown
         lgetxattr
         llistxattr
@@ -553,6 +561,7 @@ funcs = '''
         posix_fadvise
         prctl
         qsort_r
+        reallocarray
         rpmatch
         scandirat
         setprogname
@@ -3221,8 +3230,7 @@ endif
 
 ############################################################
 
-libfdisk_tests_cflags = ['-DTEST_PROGRAM',
-                         '-Wno-unused']
+libfdisk_tests_cflags = ['-DTEST_PROGRAM']
 libfdisk_tests_ldadd = [lib_fdisk_static, lib_uuid, lib_blkid]
 
 exe = executable(
@@ -3291,13 +3299,11 @@ if not is_disabler(exe)
   exes += exe
 endif
 
-sample_fdisk_cflags = ['-Wno-unused']
 sample_fdisk_ldadd = [lib_common, lib_fdisk]
 
 exe = executable(
   'sample-fdisk-mkpart',
   'libfdisk/samples/mkpart.c',
-  c_args : sample_fdisk_cflags,
   include_directories : lib_fdisk_includes,
   link_with : sample_fdisk_ldadd)
 if not is_disabler(exe)
@@ -3307,7 +3313,6 @@ endif
 exe = executable(
   'sample-fdisk-mkpart-fullspec',
   'libfdisk/samples/mkpart-fullspec.c',
-  c_args : sample_fdisk_cflags,
   include_directories : lib_fdisk_includes,
   link_with : sample_fdisk_ldadd)
 if not is_disabler(exe)
@@ -3464,8 +3469,8 @@ if not is_disabler(exe)
 endif
 
 exe = executable(
-  'sample-scols-maxout',
-  'libsmartcols/samples/maxout.c',
+  'sample-scols-continuous-json',
+  'libsmartcols/samples/continuous-json.c',
   include_directories : includes,
   link_with : [lib_smartcols, lib_common])
 if not is_disabler(exe)
@@ -3473,8 +3478,8 @@ if not is_disabler(exe)
 endif
 
 exe = executable(
-  'sample-scols-fromfile',
-  'libsmartcols/samples/fromfile.c',
+  'sample-scols-maxout',
+  'libsmartcols/samples/maxout.c',
   include_directories : includes,
   link_with : [lib_smartcols, lib_common])
 if not is_disabler(exe)
@@ -3482,8 +3487,8 @@ if not is_disabler(exe)
 endif
 
 exe = executable(
-  'sample-scols-filter',
-  'libsmartcols/samples/filter.c',
+  'sample-scols-fromfile',
+  'libsmartcols/samples/fromfile.c',
   include_directories : includes,
   link_with : [lib_smartcols, lib_common])
 if not is_disabler(exe)