lgtm: beef up list of dangerous/questionnable API calls not to make

[thirdparty/systemd.git] / meson.build

diff --git a/meson.build b/meson.build
index 8554015e67f04b2abac51dd2387d70e0fee47142..b0306601954282fab955e763af5090c7480936b3 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -133,6 +133,8 @@ networkdir = join_paths(rootprefixdir, 'lib/systemd/network')
 pkgincludedir = join_paths(includedir, 'systemd')
 systemgeneratordir = join_paths(rootlibexecdir, 'system-generators')
 usergeneratordir = join_paths(prefixdir, 'lib/systemd/user-generators')
+pkgsysconfsystemgeneratordir = join_paths(pkgsysconfdir, 'system-generators')
+pkgsysconfusergeneratordir = join_paths(pkgsysconfdir, 'user-generators')
 systemenvgeneratordir = join_paths(prefixdir, 'lib/systemd/system-environment-generators')
 userenvgeneratordir = join_paths(prefixdir, 'lib/systemd/user-environment-generators')
 systemshutdowndir = join_paths(rootlibexecdir, 'system-shutdown')
@@ -383,6 +385,16 @@ if get_option('buildtype') != 'debug'
         possible_link_flags += '-Wl,--gc-sections'
 endif
 
+if get_option('b_ndebug') == 'true'
+        # With asserts disabled with get a bunch of warnings about variables which
+        # are used only in the asserts. This is not useful at all, so let's just silence
+        # those warnings.
+        possible_cc_flags += [
+                '-Wno-unused-variable',
+                '-Wno-unused-but-set-variable',
+        ]
+endif
+
 add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : 'c')
 add_project_link_arguments(cc.get_supported_link_arguments(possible_link_flags), language : 'c')
 
@@ -1950,7 +1962,10 @@ else
                                libbasic_gcrypt]
 endif
 
-exe = executable('systemctl', 'src/systemctl/systemctl.c',
+exe = executable('systemctl',
+                 'src/systemctl/systemctl.c',
+                 'src/systemctl/sysv-compat.h',
+                 'src/systemctl/sysv-compat.c',
                  include_directories : includes,
                  link_with : systemctl_link_with,
                  dependencies : [threads,
@@ -2732,7 +2747,8 @@ exe = executable('systemd-nspawn',
                  link_with : [libcore_shared,
                               libnspawn_core,
                               libshared],
-                 dependencies : [libblkid],
+                 dependencies : [libblkid,
+                                 libseccomp],
                  install_rpath : rootlibexecdir,
                  install : true)
 public_programs += exe