Merge branch 'logger-wrong-typo' of https://github.com/chentooerl/util-linux

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

diff --git a/meson.build b/meson.build
index f7b14cf3f832c97a8f224f70a65903a78bbc2a14..3992846ae5b1d75ca7df0ee29562b4ef4b4166e0 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.60.0',
-        license : 'GPLv2+')
+        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,8 @@ funcs = '''
         posix_fadvise
         prctl
         qsort_r
+        reallocarray
+        renameat2
         rpmatch
         scandirat
         setprogname
@@ -2972,6 +2982,21 @@ if not is_disabler(exe)
   bashcompletions += ['lsclocks']
 endif
 
+if conf.get('HAVE_RENAMEAT2').to_string() == '1'
+exe = executable(
+  'exch',
+  exch_sources,
+  include_directories : includes,
+  link_with : [lib_common],
+  install_dir : usrbin_exec_dir,
+  install : true)
+if not is_disabler(exe)
+  exes += exe
+  manadocs += ['misc-utils/exch.1.adoc']
+  bashcompletions += ['exch']
+endif
+endif
+
 ############################################################
 
 opt = not get_option('build-schedutils').disabled()
@@ -3459,6 +3484,15 @@ if not is_disabler(exe)
   exes += exe
 endif
 
+exe = executable(
+  'sample-scols-continuous-json',
+  'libsmartcols/samples/continuous-json.c',
+  include_directories : includes,
+  link_with : [lib_smartcols, lib_common])
+if not is_disabler(exe)
+  exes += exe
+endif
+
 exe = executable(
   'sample-scols-maxout',
   'libsmartcols/samples/maxout.c',