diff options
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/meson.build b/meson.build index b18e645d39..79843c7319 100644 --- a/meson.build +++ b/meson.build @@ -246,10 +246,6 @@ foreach arg : ['-Wundef', '-Wendif-labels', '-Wstrict-aliasing=2', '-Wwrite-strings', - '-Wno-unused-parameter', - '-Wno-missing-field-initializers', - '-Wno-unused-result', - '-Wno-format-signedness', '-Werror=overflow', '-Wdate-time', '-Wnested-externs', @@ -268,6 +264,17 @@ foreach arg : ['-Wundef', endif endforeach +# "negative" arguments: gcc on purpose does not return an error for "-Wno-" +# arguments, just emits a warnings. So test for the "positive" version instead. +foreach arg : ['unused-parameter', + 'missing-field-initializers', + 'unused-result', + 'format-signedness'] + if cc.has_argument('-W' + arg) + add_project_arguments('-Wno-' + arg, language : 'c') + endif +endforeach + if cc.compiles(' #include <time.h> #include <inttypes.h> @@ -614,13 +621,19 @@ libm = cc.find_library('m') libdl = cc.find_library('dl') libcrypt = cc.find_library('crypt') -libcap = dependency('libcap') +libcap = dependency('libcap', required : false) +if not libcap.found() + # Compat with Ubuntu 14.04 which ships libcap w/o .pc file + libcap = cc.find_library('cap') +endif + libmount = dependency('mount', version : '>= 2.27') want_seccomp = get_option('seccomp') if want_seccomp != 'false' libseccomp = dependency('libseccomp', + version : '>= 2.3.1', required : want_seccomp == 'true') if libseccomp.found() conf.set('HAVE_SECCOMP', 1) @@ -1184,8 +1197,7 @@ executable('systemd', systemd_sources, include_directories : includes, link_with : [libcore, - libshared, - libudev], + libshared], dependencies : [threads, librt, libseccomp, @@ -1200,7 +1212,6 @@ exe = executable('systemd-analyze', systemd_analyze_sources, include_directories : includes, link_with : [libcore, - libudev, libshared], dependencies : [threads, librt, @@ -1216,8 +1227,7 @@ executable('systemd-journald', systemd_journald_sources, include_directories : includes, link_with : [libjournal_core, - libshared, - libudev], + libshared], dependencies : [threads, libxz, liblz4, @@ -1230,8 +1240,7 @@ exe = executable('systemd-cat', systemd_cat_sources, include_directories : includes, link_with : [libjournal_core, - libshared, - libudev], + libshared], dependencies : [threads], install_rpath : rootlibexecdir, install : true) @@ -1240,8 +1249,7 @@ public_programs += [exe] exe = executable('journalctl', journalctl_sources, include_directories : includes, - link_with : [libshared, - libudev], + link_with : [libshared], dependencies : [threads, libqrencode, libxz, @@ -1313,8 +1321,7 @@ if conf.get('HAVE_BLKID', 0) == 1 'src/gpt-auto-generator/gpt-auto-generator.c', 'src/basic/blkid-util.h', include_directories : includes, - link_with : [libshared, - libudev], + link_with : [libshared], dependencies : libblkid, install_rpath : rootlibexecdir, install : true, @@ -1365,8 +1372,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1 systemd_logind_sources, include_directories : includes, link_with : [liblogind_core, - libshared, - libudev], + libshared], dependencies : [threads, libacl], install_rpath : rootlibexecdir, @@ -1376,8 +1382,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1 exe = executable('loginctl', loginctl_sources, include_directories : includes, - link_with : [libshared, - libudev], + link_with : [libshared], dependencies : [threads, liblz4, libxz], @@ -1465,8 +1470,7 @@ if conf.get('ENABLE_BACKLIGHT', 0) == 1 executable('systemd-backlight', 'src/backlight/backlight.c', include_directories : includes, - link_with : [libshared, - libudev], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -1476,8 +1480,7 @@ if conf.get('ENABLE_RFKILL', 0) == 1 executable('systemd-rfkill', 'src/rfkill/rfkill.c', include_directories : includes, - link_with : [libshared, - libudev], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -1975,8 +1978,7 @@ executable('systemd-initctl', exe = executable('systemd-mount', 'src/mount/mount-tool.c', include_directories : includes, - link_with : [libshared, - libudev], + link_with : [libshared], install_rpath : rootlibexecdir, install : true) public_programs += [exe] @@ -2100,8 +2102,7 @@ public_programs += [exe] executable('systemd-shutdown', systemd_shutdown_sources, include_directories : includes, - link_with : [libshared, - libudev], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -2146,9 +2147,7 @@ exe = executable('systemd-nspawn', 'src/core/loopback-setup.c', 'src/core/loopback-setup.h', include_directories : [includes, include_directories('src/nspawn')], - link_with : [libfirewall, - libshared, - libudev], + link_with : [libshared], dependencies : [libacl, libblkid, libseccomp, @@ -2162,7 +2161,6 @@ if conf.get('ENABLE_NETWORKD', 0) == 1 systemd_networkd_sources, include_directories : includes, link_with : [libnetworkd_core, - libfirewall, libsystemd_network, libudev_internal, libshared], |