diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-17 19:25:00 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-23 21:47:29 -0400 |
| commit | 37efbbd8211bd40e2d1f1732e27bd7d3ca504a12 (patch) | |
| tree | 2f445eca4ba6baa5bb3f41b1af4f3680b6ddae17 /meson.build | |
| parent | 0a76b0e8a2043936b6dd598a7a3f924bd683eec8 (diff) | |
| download | systemd-37efbbd8211bd40e2d1f1732e27bd7d3ca504a12.tar.gz systemd-37efbbd8211bd40e2d1f1732e27bd7d3ca504a12.tar.bz2 systemd-37efbbd8211bd40e2d1f1732e27bd7d3ca504a12.zip | |
meson: reindent all files with 8 spaces
The indentation for emacs'es meson-mode is added .dir-locals.
All files are reindented automatically, using the lasest meson-mode from git.
Indentation should now be fairly consistent.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 1824 |
1 files changed, 913 insertions, 911 deletions
diff --git a/meson.build b/meson.build index 9504e984ec..a9011e50d2 100644 --- a/meson.build +++ b/meson.build @@ -1,13 +1,11 @@ -# -*- mode: meson -*- - project('systemd', 'c', version : '233', license : 'LGPLv2+', default_options: [ - 'c_std=gnu99', - 'prefix=/usr', - 'sysconfdir=/etc', - 'localstatedir=/var', + 'c_std=gnu99', + 'prefix=/usr', + 'sysconfdir=/etc', + 'localstatedir=/var', ], meson_version : '>= 0.39.1', ) @@ -30,18 +28,18 @@ m4_defines = [] rootprefixdir = get_option('rootprefix') if get_option('split-usr') - conf.set('HAVE_SPLIT_USR', 1) - rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/' + conf.set('HAVE_SPLIT_USR', 1) + rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/' else - rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/usr' + rootprefixdir = rootprefixdir != '' ? rootprefixdir : '/usr' endif sysvinit_path = get_option('sysvinit-path') sysvrcnd_path = get_option('sysvrcnd-path') if sysvinit_path != '' or sysvrcnd_path != '' - conf.set('HAVE_SYSV_COMPAT', 1, - description : 'SysV init scripts and rcN.d links are supported') - m4_defines += ['-DHAVE_SYSV_COMPAT'] + conf.set('HAVE_SYSV_COMPAT', 1, + description : 'SysV init scripts and rcN.d links are supported') + m4_defines += ['-DHAVE_SYSV_COMPAT'] endif # join_paths ignore the preceding arguments if an absolute component is @@ -49,7 +47,7 @@ endif # absolute or relative. prefixdir = get_option('prefix') if not prefixdir.startswith('/') - error('Prefix is not absolute: "@0@"'.format(prefixdir)) + error('Prefix is not absolute: "@0@"'.format(prefixdir)) endif bindir = join_paths(prefixdir, get_option('bindir')) libdir = join_paths(prefixdir, get_option('libdir')) @@ -63,7 +61,7 @@ rootlibexecdir = join_paths(rootprefixdir, 'lib/systemd') rootlibdir = get_option('rootlibdir') if rootlibdir == '' - rootlibdir = join_paths(rootprefixdir, libdir.split('/')[-1]) + rootlibdir = join_paths(rootprefixdir, libdir.split('/')[-1]) endif # Dirs of external packages @@ -113,27 +111,27 @@ randomseeddir = join_paths(localstatedir, 'lib/systemd') dbuspolicydir = get_option('dbuspolicydir') if dbuspolicydir == '' - dbuspolicydir = join_paths(datadir, 'dbus-1/system.d') + dbuspolicydir = join_paths(datadir, 'dbus-1/system.d') endif dbussessionservicedir = get_option('dbussessionservicedir') if dbussessionservicedir == '' - dbussessionservicedir = join_paths(datadir, 'dbus-1/services') + dbussessionservicedir = join_paths(datadir, 'dbus-1/services') endif dbussystemservicedir = get_option('dbussystemservicedir') if dbussystemservicedir == '' - dbussystemservicedir = join_paths(datadir, 'dbus-1/system-services') + dbussystemservicedir = join_paths(datadir, 'dbus-1/system-services') endif pamlibdir = get_option('pamlibdir') if pamlibdir == '' - pamlibdir = join_paths(rootlibdir, 'security') + pamlibdir = join_paths(rootlibdir, 'security') endif pamconfdir = get_option('pamconfdir') if pamconfdir == '' - pamconfdir = join_paths(sysconfdir, 'pam.d') + pamconfdir = join_paths(sysconfdir, 'pam.d') endif conf.set_quoted('PKGSYSCONFDIR', pkgsysconfdir) @@ -264,9 +262,9 @@ foreach arg : ['-Wundef', '-fPIE', '--param=ssp-buffer-size=4', ] - if cc.has_argument(arg) - add_project_arguments(arg, language : 'c') - endif + if cc.has_argument(arg) + add_project_arguments(arg, language : 'c') + endif endforeach if cc.compiles(' @@ -279,18 +277,18 @@ if cc.compiles(' return 0; } ') - # TODO: message? - add_project_arguments('-Werror=shadow', language : 'c') + # TODO: message? + add_project_arguments('-Werror=shadow', language : 'c') endif if cc.get_id() == 'clang' - foreach arg : ['-Wno-typedef-redefinition', - '-Wno-gnu-variable-sized-type-not-at-end', - ] - if cc.has_argument(arg) - add_project_arguments(arg, language : 'c') - endif - endforeach + foreach arg : ['-Wno-typedef-redefinition', + '-Wno-gnu-variable-sized-type-not-at-end', + ] + if cc.has_argument(arg) + add_project_arguments(arg, language : 'c') + endif + endforeach endif # --as-needed and --no-undefined are provided by meson by default, @@ -300,9 +298,9 @@ foreach arg : ['-Wl,-z,relro', '-pie', '-Wl,-fuse-ld=gold', ] - if cc.has_argument(arg) - add_project_link_arguments(arg, language : 'c') - endif + if cc.has_argument(arg) + add_project_link_arguments(arg, language : 'c') + endif endforeach cpp = ' '.join(cc.cmd_array()) + ' -E' @@ -332,10 +330,10 @@ foreach decl : ['char16_t', 'key_serial_t', 'struct ethtool_link_settings', ] - if cc.sizeof(decl, prefix : decl_headers) > 0 - # We get -1 if the size cannot be determined - conf.set('HAVE_' + decl.underscorify().to_upper(), 1) - endif + if cc.sizeof(decl, prefix : decl_headers) > 0 + # We get -1 if the size cannot be determined + conf.set('HAVE_' + decl.underscorify().to_upper(), 1) + endif endforeach foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], @@ -360,41 +358,41 @@ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], ['IFA_FLAGS', 'linux/if_addr.h'], ['LO_FLAGS_PARTSCAN', 'linux/loop.h'], ] - prefix = decl.length() > 2 ? decl[2] : '' - have = cc.has_header_symbol(decl[1], decl[0], prefix : prefix) - conf.set10('HAVE_DECL_' + decl[0], have) + prefix = decl.length() > 2 ? decl[2] : '' + have = cc.has_header_symbol(decl[1], decl[0], prefix : prefix) + conf.set10('HAVE_DECL_' + decl[0], have) endforeach skip = false foreach ident : ['secure_getenv', '__secure_getenv'] - if not skip and cc.has_function(ident) - conf.set('HAVE_' + ident.to_upper(), 1) - skip = true - endif + if not skip and cc.has_function(ident) + conf.set('HAVE_' + ident.to_upper(), 1) + skip = true + endif endforeach foreach ident : [ - ['memfd_create', '''#include <sys/memfd.h>'''], - ['gettid', '''#include <sys/types.h>'''], - ['pivot_root', '''#include <stdlib.h>'''], # no known header declares pivot_root - ['name_to_handle_at', '''#define _GNU_SOURCE - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h>'''], - ['setns', '''#define _GNU_SOURCE - #include <sched.h>'''], - ['getrandom', '''#include <sys/random.h>'''], - ['renameat2', '''#include <stdio.h>'''], - ['kcmp', '''#include <linux/kcmp.h>'''], - ['keyctl', '''#include <sys/types.h> - #include <keyutils.h>'''], - ['copy_file_range', '''#include <sys/syscall.h> - #include <unistd.h>'''], - ['explicit_bzero' , '''#include <strings.h>'''], - ] - - have = cc.has_function(ident[0], prefix : ident[1]) - conf.set10('HAVE_DECL_' + ident[0].to_upper(), have) + ['memfd_create', '''#include <sys/memfd.h>'''], + ['gettid', '''#include <sys/types.h>'''], + ['pivot_root', '''#include <stdlib.h>'''], # no known header declares pivot_root + ['name_to_handle_at', '''#define _GNU_SOURCE + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h>'''], + ['setns', '''#define _GNU_SOURCE + #include <sched.h>'''], + ['getrandom', '''#include <sys/random.h>'''], + ['renameat2', '''#include <stdio.h>'''], + ['kcmp', '''#include <linux/kcmp.h>'''], + ['keyctl', '''#include <sys/types.h> + #include <keyutils.h>'''], + ['copy_file_range', '''#include <sys/syscall.h> + #include <unistd.h>'''], + ['explicit_bzero' , '''#include <strings.h>'''], +] + + have = cc.has_function(ident[0], prefix : ident[1]) + conf.set10('HAVE_DECL_' + ident[0].to_upper(), have) endforeach ##################################################################### @@ -428,16 +426,19 @@ progs = [['telinit', '/lib/sysvinit/telinit'], ['setfont', '/usr/bin/setfont', 'KBD_SETFONT'], ] foreach prog : progs - path = get_option(prog[0] + '-path') - if path != '' - message('Using @1@ for @0@'.format(prog[0], path)) - else - exe = find_program(prog[0], '/usr/sbin/' + prog[0], '/sbin/' + prog[0], required: false) - path = exe.found() ? exe.path() : prog[1] - endif - name = prog.length() > 2 ? prog[2] : prog[0].to_upper() - conf.set_quoted(name, path) - substs.set(name, path) + path = get_option(prog[0] + '-path') + if path != '' + message('Using @1@ for @0@'.format(prog[0], path)) + else + exe = find_program(prog[0], + '/usr/sbin/' + prog[0], + '/sbin/' + prog[0], + required: false) + path = exe.found() ? exe.path() : prog[1] + endif + name = prog.length() > 2 ? prog[2] : prog[0].to_upper() + conf.set_quoted(name, path) + substs.set(name, path) endforeach # TODO: add ln --relative check @@ -456,22 +457,23 @@ gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C' gperf_snippet = run_command('sh', '-c', gperf_snippet_format.format(gperf.path())) gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout()) if cc.compiles(gperf_test) - gperf_len_type = 'size_t' + gperf_len_type = 'size_t' else - gperf_test = gperf_test_format.format('unsigned', gperf_snippet.stdout()) - if cc.compiles(gperf_test) - gperf_len_type = 'unsigned' - else - error('unable to determine gperf len type') - endif + gperf_test = gperf_test_format.format('unsigned', gperf_snippet.stdout()) + if cc.compiles(gperf_test) + gperf_len_type = 'unsigned' + else + error('unable to determine gperf len type') + endif endif message('gperf len type is @0@'.format(gperf_len_type)) -conf.set('GPERF_LEN_TYPE', gperf_len_type, description : 'The type of gperf "len" parameter') +conf.set('GPERF_LEN_TYPE', gperf_len_type, + description : 'The type of gperf "len" parameter') ############################################################ if not cc.has_header('sys/capability.h') - error('POSIX caps headers not found') + error('POSIX caps headers not found') endif foreach header : ['linux/btrfs.h', 'linux/memfd.h', @@ -479,9 +481,9 @@ foreach header : ['linux/btrfs.h', 'valgrind/memcheck.h', 'valgrind/valgrind.h', ] - if cc.has_header(header) - conf.set('HAVE_' + header.underscorify().to_upper(), 1) - endif + if cc.has_header(header) + conf.set('HAVE_' + header.underscorify().to_upper(), 1) + endif endforeach ############################################################ @@ -492,27 +494,27 @@ default_hierarchy = get_option('default-hierarchy') conf.set_quoted('DEFAULT_HIERARCHY_NAME', default_hierarchy, description : 'default cgroup hierarchy as string') if default_hierarchy == 'legacy' - conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_NONE') + conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_NONE') elif default_hierarchy == 'hybrid' - conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_SYSTEMD') + conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_SYSTEMD') else - conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_ALL') + conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_ALL') endif time_epoch = get_option('time-epoch') if time_epoch == '' - NEWS = files('NEWS') - time_epoch = run_command(stat, '-c', '%Y', NEWS).stdout() + NEWS = files('NEWS') + time_epoch = run_command(stat, '-c', '%Y', NEWS).stdout() endif time_epoch = time_epoch.to_int() conf.set('TIME_EPOCH', time_epoch) system_uid_max = get_option('system-uid-max') if system_uid_max == '' - system_uid_max = run_command( - awk, - 'BEGIN { uid=999 } /^\s*SYS_UID_MAX\s+/ { uid=$2 } END { print uid }', - '/etc/login.defs').stdout() + system_uid_max = run_command( + awk, + 'BEGIN { uid=999 } /^\s*SYS_UID_MAX\s+/ { uid=$2 } END { print uid }', + '/etc/login.defs').stdout() endif system_uid_max = system_uid_max.to_int() conf.set('SYSTEM_UID_MAX', system_uid_max) @@ -524,10 +526,10 @@ conf.set_quoted('NOBODY_GROUP_NAME', get_option('nobody-group')) system_gid_max = get_option('system-gid-max') if system_gid_max == '' - system_gid_max = run_command( - awk, - 'BEGIN { gid=999 } /^\s*SYS_GID_MAX\s+/ { gid=$2 } END { print gid }', - '/etc/login.defs').stdout() + system_gid_max = run_command( + awk, + 'BEGIN { gid=999 } /^\s*SYS_GID_MAX\s+/ { gid=$2 } END { print gid }', + '/etc/login.defs').stdout() endif system_gid_max = system_gid_max.to_int() conf.set('SYSTEM_GID_MAX', system_gid_max) @@ -539,11 +541,11 @@ conf.set('TTY_GID', tty_gid) substs.set('TTY_GID', tty_gid) if get_option('adm-group') - m4_defines += ['-DENABLE_ADM_GROUP'] + m4_defines += ['-DENABLE_ADM_GROUP'] endif if get_option('wheel-group') - m4_defines += ['-DENABLE_WHEEL_GROUP'] + m4_defines += ['-DENABLE_WHEEL_GROUP'] endif substs.set('DEV_KVM_MODE', get_option('dev-kvm-mode')) @@ -582,346 +584,346 @@ libmount = dependency('mount', want_seccomp = get_option('seccomp') if want_seccomp != 'false' - libseccomp = dependency('libseccomp', - required : want_seccomp == 'true') - if libseccomp.found() - conf.set('HAVE_SECCOMP', 1) - m4_defines += ['-DHAVE_SECCOMP'] - endif + libseccomp = dependency('libseccomp', + required : want_seccomp == 'true') + if libseccomp.found() + conf.set('HAVE_SECCOMP', 1) + m4_defines += ['-DHAVE_SECCOMP'] + endif else - libseccomp = [] + libseccomp = [] endif want_selinux = get_option('selinux') if want_selinux != 'false' - libselinux = dependency('libselinux', - version : '>= 2.1.9', - required : want_selinux == 'true') - if libselinux.found() - conf.set('HAVE_SELINUX', 1) - m4_defines += ['-DHAVE_SELINUX'] - endif + libselinux = dependency('libselinux', + version : '>= 2.1.9', + required : want_selinux == 'true') + if libselinux.found() + conf.set('HAVE_SELINUX', 1) + m4_defines += ['-DHAVE_SELINUX'] + endif else - libselinux = [] + libselinux = [] endif want_apparmor = get_option('apparmor') if want_apparmor != 'false' - libapparmor = dependency('libapparmor', - required : want_apparmor == 'true') - if libapparmor.found() - conf.set('HAVE_APPARMOR', 1) - m4_defines += ['-DHAVE_APPARMOR'] - endif + libapparmor = dependency('libapparmor', + required : want_apparmor == 'true') + if libapparmor.found() + conf.set('HAVE_APPARMOR', 1) + m4_defines += ['-DHAVE_APPARMOR'] + endif else - libapparmor = [] + libapparmor = [] endif want_smack = get_option('smack') if want_smack != 'false' - libsmack = dependency('libsmack', - required : want_smack == 'true') - if libsmack.found() - conf.set('HAVE_SMACK', 1) - m4_defines += ['-DHAVE_SMACK'] - endif + libsmack = dependency('libsmack', + required : want_smack == 'true') + if libsmack.found() + conf.set('HAVE_SMACK', 1) + m4_defines += ['-DHAVE_SMACK'] + endif else - libsmack = [] + libsmack = [] endif smack_run_label = get_option('smack-run-label') if smack_run_label != '' - conf.set_quoted('SMACK_RUN_LABEL', smack_run_label) - m4_defines += ['-DHAVE_SMACK_RUN_LABEL'] + conf.set_quoted('SMACK_RUN_LABEL', smack_run_label) + m4_defines += ['-DHAVE_SMACK_RUN_LABEL'] endif want_polkit = get_option('polkit') install_polkit = false install_polkit_pkla = false if want_polkit != 'false' - conf.set('ENABLE_POLKIT', 1) - install_polkit = true + conf.set('ENABLE_POLKIT', 1) + install_polkit = true - libpolkit = dependency('polkit-gobject-1', - required : false) - if libpolkit.found() and libpolkit.version().version_compare('< 0.106') - message('Old polkit detected, will install pkla files') - install_polkit_pkla = true - endif + libpolkit = dependency('polkit-gobject-1', + required : false) + if libpolkit.found() and libpolkit.version().version_compare('< 0.106') + message('Old polkit detected, will install pkla files') + install_polkit_pkla = true + endif endif want_audit = get_option('audit') if want_audit != 'false' - libaudit = dependency('audit', required : want_audit == 'true') - if libaudit.found() - conf.set('HAVE_AUDIT', 1) - endif + libaudit = dependency('audit', required : want_audit == 'true') + if libaudit.found() + conf.set('HAVE_AUDIT', 1) + endif else - libaudit = [] + libaudit = [] endif want_blkid = get_option('blkid') if want_blkid != 'false' - libblkid = dependency('blkid', required : want_blkid == 'true') - if libblkid.found() - conf.set('HAVE_BLKID', 1) - endif + libblkid = dependency('blkid', required : want_blkid == 'true') + if libblkid.found() + conf.set('HAVE_BLKID', 1) + endif else - libblkid = [] + libblkid = [] endif want_kmod = get_option('kmod') if want_kmod != 'false' - libkmod = dependency('libkmod', - version : '>= 15', - required : want_kmod == 'true') - if libkmod.found() - conf.set('HAVE_KMOD', 1) - endif + libkmod = dependency('libkmod', + version : '>= 15', + required : want_kmod == 'true') + if libkmod.found() + conf.set('HAVE_KMOD', 1) + endif else - libkmod = [] + libkmod = [] endif want_pam = get_option('pam') if want_pam != 'false' - libpam = cc.find_library('pam', required : want_pam == 'true') - libpam_misc = cc.find_library('pam_misc', required : want_pam == 'true') - if libpam.found() and libpam_misc.found() - conf.set('HAVE_PAM', 1) - m4_defines += ['-DHAVE_PAM'] - endif + libpam = cc.find_library('pam', required : want_pam == 'true') + libpam_misc = cc.find_library('pam_misc', required : want_pam == 'true') + if libpam.found() and libpam_misc.found() + conf.set('HAVE_PAM', 1) + m4_defines += ['-DHAVE_PAM'] + endif else - libpam = [] - libpam_misc = [] + libpam = [] + libpam_misc = [] endif want_microhttpd = get_option('microhttpd') if want_microhttpd != 'false' - libmicrohttpd = dependency('libmicrohttpd', - version : '>= 0.9.33', - required : want_microhttpd == 'true') - if libmicrohttpd.found() - conf.set('HAVE_MICROHTTPD', 1) - m4_defines += ['-DHAVE_MICROHTTPD'] - endif + libmicrohttpd = dependency('libmicrohttpd', + version : '>= 0.9.33', + required : want_microhttpd == 'true') + if libmicrohttpd.found() + conf.set('HAVE_MICROHTTPD', 1) + m4_defines += ['-DHAVE_MICROHTTPD'] + endif else - libmicrohttpd = [] + libmicrohttpd = [] endif want_libcryptsetup = get_option('libcryptsetup') if want_libcryptsetup != 'false' - libcryptsetup = dependency('libcryptsetup', - version : '>= 1.6.0', - required : want_libcryptsetup == 'true') - if libcryptsetup.found() - conf.set('HAVE_LIBCRYPTSETUP', 1) - endif + libcryptsetup = dependency('libcryptsetup', + version : '>= 1.6.0', + required : want_libcryptsetup == 'true') + if libcryptsetup.found() + conf.set('HAVE_LIBCRYPTSETUP', 1) + endif else - libcryptsetup = [] + libcryptsetup = [] endif want_libcurl = get_option('libcurl') if want_libcurl != 'false' - libcurl = dependency('libcurl', - version : '>= 7.32.0', - required : want_libcurl == 'true') - if libcurl.found() - conf.set('HAVE_LIBCURL', 1) - m4_defines += ['-DHAVE_LIBCURL'] - endif + libcurl = dependency('libcurl', + version : '>= 7.32.0', + required : want_libcurl == 'true') + if libcurl.found() + conf.set('HAVE_LIBCURL', 1) + m4_defines += ['-DHAVE_LIBCURL'] + endif else - libcurl = [] + libcurl = [] endif want_libidn = get_option('libidn') if want_libidn != 'false' - libidn = dependency('libidn', - required : want_libidn == 'true') - if libidn.found() - conf.set('HAVE_LIBIDN', 1) - m4_defines += ['-DHAVE_LIBIDN'] - endif + libidn = dependency('libidn', + required : want_libidn == 'true') + if libidn.found() + conf.set('HAVE_LIBIDN', 1) + m4_defines += ['-DHAVE_LIBIDN'] + endif else - libidn = [] + libidn = [] endif want_libiptc = get_option('libiptc') if want_libiptc != 'false' - libiptc = dependency('libiptc', - required : want_libiptc == 'true') - if libiptc.found() - conf.set('HAVE_LIBIPTC', 1) - m4_defines += ['-DHAVE_LIBIPTC'] - endif + libiptc = dependency('libiptc', + required : want_libiptc == 'true') + if libiptc.found() + conf.set('HAVE_LIBIPTC', 1) + m4_defines += ['-DHAVE_LIBIPTC'] + endif else - libiptc = [] + libiptc = [] endif want_qrencode = get_option('qrencode') if want_qrencode != 'false' - libqrencode = dependency('libqrencode', - required : want_qrencode == 'true') - if libqrencode.found() - conf.set('HAVE_QRENCODE', 1) - endif + libqrencode = dependency('libqrencode', + required : want_qrencode == 'true') + if libqrencode.found() + conf.set('HAVE_QRENCODE', 1) + endif else - libqrencode = [] + libqrencode = [] endif want_gnutls = get_option('gnutls') if want_gnutls != 'false' - libgnutls = dependency('gnutls', - version : '>= 3.1.4', - required : want_gnutls == 'true') - if libgnutls.found() - conf.set('HAVE_GNUTLS', 1) - endif + libgnutls = dependency('gnutls', + version : '>= 3.1.4', + required : want_gnutls == 'true') + if libgnutls.found() + conf.set('HAVE_GNUTLS', 1) + endif else - libgnutls = [] + libgnutls = [] endif want_elfutils = get_option('elfutils') if want_elfutils != 'false' - libdw = dependency('libdw', - required : want_elfutils == 'true') - if libdw.found() - conf.set('HAVE_ELFUTILS', 1) - endif + libdw = dependency('libdw', + required : want_elfutils == 'true') + if libdw.found() + conf.set('HAVE_ELFUTILS', 1) + endif else - libdw = [] + libdw = [] endif want_zlib = get_option('zlib') if want_zlib != 'false' - libz = dependency('zlib', - required : want_zlib == 'true') - if libz.found() - conf.set('HAVE_ZLIB', 1) - endif + libz = dependency('zlib', + required : want_zlib == 'true') + if libz.found() + conf.set('HAVE_ZLIB', 1) + endif else - libz = [] + libz = [] endif want_bzip2 = get_option('bzip2') if want_bzip2 != 'false' - libbzip2 = cc.find_library('bz2', - required : want_bzip2 == 'true') - if libbzip2.found() - conf.set('HAVE_BZIP2', 1) - endif + libbzip2 = cc.find_library('bz2', + required : want_bzip2 == 'true') + if libbzip2.found() + conf.set('HAVE_BZIP2', 1) + endif else - libbzip2 = [] + libbzip2 = [] endif want_xz = get_option('xz') if want_xz != 'false' - libxz = dependency('liblzma', - required : want_xz == 'true') - if libxz.found() - conf.set('HAVE_XZ', 1) - endif + libxz = dependency('liblzma', + required : want_xz == 'true') + if libxz.found() + conf.set('HAVE_XZ', 1) + endif else - libxz = [] + libxz = [] endif want_lz4 = get_option('lz4') if want_lz4 != 'false' - liblz4 = dependency('liblz4', - required : want_lz4 == 'true') - if liblz4.found() - conf.set('HAVE_LZ4', 1) - endif + liblz4 = dependency('liblz4', + required : want_lz4 == 'true') + if liblz4.found() + conf.set('HAVE_LZ4', 1) + endif else - liblz4 = [] + liblz4 = [] endif libacl = cc.find_library('acl', required : false) if libacl.found() - conf.set('HAVE_ACL', 1) - m4_defines += ['-DHAVE_ACL'] + conf.set('HAVE_ACL', 1) + m4_defines += ['-DHAVE_ACL'] endif want_glib = get_option('glib') if want_glib != 'false' - libglib = dependency('glib-2.0', - version : '>= 2.22.0', - required : want_glib == 'true') - libgobject = dependency('gobject-2.0', - version : '>= 2.22.0', - required : want_glib == 'true') - libgio = dependency('gio-2.0', - required : want_glib == 'true') - if libglib.found() and libgobject.found() and libgio.found() - conf.set('HAVE_GLIB', 1) - endif + libglib = dependency('glib-2.0', + version : '>= 2.22.0', + required : want_glib == 'true') + libgobject = dependency('gobject-2.0', + version : '>= 2.22.0', + required : want_glib == 'true') + libgio = dependency('gio-2.0', + required : want_glib == 'true') + if libglib.found() and libgobject.found() and libgio.found() + conf.set('HAVE_GLIB', 1) + endif else - libglib = [] - libgobject = [] - libgio = [] + libglib = [] + libgobject = [] + libgio = [] endif want_xkbcommon = get_option('xkbcommon') if want_xkbcommon != 'false' - libxkbcommon = dependency('xkbcommon', - version : '>= 0.3.0', - required : want_xkbcommon == 'true') - if libxkbcommon.found() - conf.set('HAVE_XKBCOMMON', 1) - endif + libxkbcommon = dependency('xkbcommon', + version : '>= 0.3.0', + required : want_xkbcommon == 'true') + if libxkbcommon.found() + conf.set('HAVE_XKBCOMMON', 1) + endif else - libxkbcommon = [] + libxkbcommon = [] endif want_dbus = get_option('dbus') if want_dbus != 'false' - libdbus = dependency('dbus-1', - version : '>= 1.3.2', - required : want_dbus == 'true') - if libdbus.found() - conf.set('HAVE_DBUS', 1) - endif + libdbus = dependency('dbus-1', + version : '>= 1.3.2', + required : want_dbus == 'true') + if libdbus.found() + conf.set('HAVE_DBUS', 1) + endif else - libdbus = [] + libdbus = [] endif want_libgcrypt = get_option('libgcrypt') if want_libgcrypt != 'false' - libgcrypt = cc.find_library('gcrypt', required : want_libgcrypt == 'true') - if libgcrypt.found() - conf.set('HAVE_LIBGCRYPT', 1) - endif + libgcrypt = cc.find_library('gcrypt', required : want_libgcrypt == 'true') + if libgcrypt.found() + conf.set('HAVE_LIBGCRYPT', 1) + endif else - libgcrypt = [] + libgcrypt = [] endif want_importd = get_option('importd') if want_importd != 'false' - have_deps = (conf.get('HAVE_LIBCURL', 0) == 1 and - conf.get('HAVE_ZLIB', 0) == 1 and - conf.get('HAVE_BZIP2', 0) == 1 and - conf.get('HAVE_XZ', 0) == 1 and - conf.get('HAVE_LIBGCRYPT', 0) == 1) - if have_deps - conf.set('ENABLE_IMPORTD', 1) - elif want_importd == 'true' - error('importd support was requested, but dependencies are not available') - endif + have_deps = (conf.get('HAVE_LIBCURL', 0) == 1 and + conf.get('HAVE_ZLIB', 0) == 1 and + conf.get('HAVE_BZIP2', 0) == 1 and + conf.get('HAVE_XZ', 0) == 1 and + conf.get('HAVE_LIBGCRYPT', 0) == 1) + if have_deps + conf.set('ENABLE_IMPORTD', 1) + elif want_importd == 'true' + error('importd support was requested, but dependencies are not available') + endif endif want_remote = get_option('remote') if want_remote != 'false' - have_deps = [conf.get('HAVE_MICROHTTPD', 0) == 1, - conf.get('HAVE_LIBCURL', 0) == 1] - # sd-j-remote requires µhttpd, and sd-j-upload requires libcurl, so - # it's possible to build one without the other. Complain only if - # support was explictly requested. The auxiliary files like sysusers - # config should be installed when any of the programs are built. - if want_remote == 'true' and not (have_deps[0] and have_deps[1]) - error('remote support was requested, but dependencies are not available') - endif - if have_deps[0] or have_deps[1] - conf.set('ENABLE_REMOTE', 1) - endif + have_deps = [conf.get('HAVE_MICROHTTPD', 0) == 1, + conf.get('HAVE_LIBCURL', 0) == 1] + # sd-j-remote requires µhttpd, and sd-j-upload requires libcurl, so + # it's possible to build one without the other. Complain only if + # support was explictly requested. The auxiliary files like sysusers + # config should be installed when any of the programs are built. + if want_remote == 'true' and not (have_deps[0] and have_deps[1]) + error('remote support was requested, but dependencies are not available') + endif + if have_deps[0] or have_deps[1] + conf.set('ENABLE_REMOTE', 1) + endif endif foreach pair : [['utmp', 'HAVE_UTMP'], @@ -952,10 +954,10 @@ foreach pair : [['utmp', 'HAVE_UTMP'], ['ima', 'HAVE_IMA'], ] - if get_option(pair[0]) - conf.set(pair[1], 1) - m4_defines += ['-D' + pair[1]] - endif + if get_option(pair[0]) + conf.set(pair[1], 1) + m4_defines += ['-D' + pair[1]] + endif endforeach want_tests = get_option('tests') @@ -965,29 +967,29 @@ tests = [] ##################################################################### if get_option('efi') - efi_arch = host_machine.cpu_family() + efi_arch = host_machine.cpu_family() - if efi_arch == 'ia32' - EFI_MACHINE_TYPE_NAME = 'ia32' - elif efi_arch == 'x86_64' - EFI_MACHINE_TYPE_NAME = 'x64' - elif efi_arch == 'arm' - EFI_MACHINE_TYPE_NAME = 'arm' - elif efi_arch == 'aarch64' - EFI_MACHINE_TYPE_NAME = 'aa64' - else - EFI_MACHINE_TYPE_NAME = '' - endif + if efi_arch == 'ia32' + EFI_MACHINE_TYPE_NAME = 'ia32' + elif efi_arch == 'x86_64' + EFI_MACHINE_TYPE_NAME = 'x64' + elif efi_arch == 'arm' + EFI_MACHINE_TYPE_NAME = 'arm' + elif efi_arch == 'aarch64' + EFI_MACHINE_TYPE_NAME = 'aa64' + else + EFI_MACHINE_TYPE_NAME = '' + endif - conf.set('ENABLE_EFI', 1) - conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) + conf.set('ENABLE_EFI', 1) + conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) endif ##################################################################### config_h = configure_file( - output : 'config.h', - configuration : conf) + output : 'config.h', + configuration : conf) includes = include_directories('src/basic', 'src/shared', @@ -1023,29 +1025,29 @@ subdir('src/journal') subdir('src/login') libjournal_core = static_library( - 'journal-core', - libjournal_core_sources, - journald_gperf_c, - include_directories : includes, - install : false) + 'journal-core', + libjournal_core_sources, + journald_gperf_c, + include_directories : includes, + install : false) libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym) libsystemd = shared_library( - 'systemd', - libsystemd_internal_sources, - journal_internal_sources, - version : '0.18.0', - include_directories : includes, - link_args : ['-shared', - '-Wl,--version-script=' + libsystemd_sym_path], - link_with : [libbasic], - dependencies : [threads, - librt, - libxz, - liblz4], - link_depends : libsystemd_sym, - install : true, - install_dir : rootlibdir) + 'systemd', + libsystemd_internal_sources, + journal_internal_sources, + version : '0.18.0', + include_directories : includes, + link_args : ['-shared', + '-Wl,--version-script=' + libsystemd_sym_path], + link_with : [libbasic], + dependencies : [threads, + librt, + libxz, + liblz4], + link_depends : libsystemd_sym, + install : true, + install_dir : rootlibdir) ############################################################ @@ -1083,51 +1085,51 @@ subdir('test') # only static linking apart from libdl, to make sure that the # module is linked to all libraries that it uses. test_dlopen = executable( - 'test-dlopen', - test_dlopen_c, - include_directories : includes, - link_with : [libbasic], - dependencies : [libdl]) + 'test-dlopen', + test_dlopen_c, + include_directories : includes, + link_with : [libbasic], + dependencies : [libdl]) foreach tuple : [['myhostname', 'HAVE_MYHOSTNAME', []], ['systemd', '', []], ['mymachines', 'ENABLE_MACHINED', []], ['resolve', 'ENABLE_RESOLVED', [libdl]]] - condition = tuple[1] == '' or conf.get(tuple[1], 0) == 1 - if condition - module = tuple[0] - extra_deps = tuple[2] - - sym = 'src/nss-@0@/nss-@0@.sym'.format(module) - version_script_arg = join_paths(meson.current_source_dir(), sym) - - nss = shared_library( - 'nss_' + module, - 'src/nss-@0@/nss-@0@.c'.format(module), - version : '2', - include_directories : includes, - link_args : ['-shared', - '-Wl,--version-script=' + version_script_arg, - '-Wl,--undefined'], - link_with : [libsystemd_internal, - libbasic], - dependencies : [threads, - librt] + extra_deps, - link_depends : sym, - install : true, - install_dir : rootlibdir) - - # We cannot use shared_module because it does not support version suffix. - # Unfortunately shared_library insists on creating the symlink… - meson.add_install_script('sh', '-c', - 'rm $DESTDIR@0@/libnss_@1@.so' - .format(rootlibdir, module)) - - test('dlopen-nss_' + module, - test_dlopen, - args : [nss.full_path()]) # path to dlopen must include a slash - endif + condition = tuple[1] == '' or conf.get(tuple[1], 0) == 1 + if condition + module = tuple[0] + extra_deps = tuple[2] + + sym = 'src/nss-@0@/nss-@0@.sym'.format(module) + version_script_arg = join_paths(meson.current_source_dir(), sym) + + nss = shared_library( + 'nss_' + module, + 'src/nss-@0@/nss-@0@.c'.format(module), + version : '2', + include_directories : includes, + link_args : ['-shared', + '-Wl,--version-script=' + version_script_arg, + '-Wl,--undefined'], + link_with : [libsystemd_internal, + libbasic], + dependencies : [threads, + librt] + extra_deps, + link_depends : sym, + install : true, + install_dir : rootlibdir) + + # We cannot use shared_module because it does not support version suffix. + # Unfortunately shared_library insists on creating the symlink… + meson.add_install_script('sh', '-c', + 'rm $DESTDIR@0@/libnss_@1@.so' + .format(rootlibdir, module)) + + test('dlopen-nss_' + module, + test_dlopen, + args : [nss.full_path()]) # path to dlopen must include a slash + endif endforeach ############################################################ @@ -1229,161 +1231,161 @@ executable('systemd-fstab-generator', install_dir : systemgeneratordir) if conf.get('ENABLE_ENVIRONMENT_D', 0) == 1 - executable('30-systemd-environment-d-generator', - 'src/environment-d-generator/environment-d-generator.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : userenvgeneratordir) + executable('30-systemd-environment-d-generator', + 'src/environment-d-generator/environment-d-generator.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : userenvgeneratordir) - meson.add_install_script(meson_make_symlink, - join_paths(sysconfdir, 'environment'), - join_paths(environmentdir, '99-environment.conf')) + meson.add_install_script(meson_make_symlink, + join_paths(sysconfdir, 'environment'), + join_paths(environmentdir, '99-environment.conf')) endif if conf.get('ENABLE_HIBERNATE', 0) == 1 - executable('systemd-hibernate-resume-generator', - 'src/hibernate-resume/hibernate-resume-generator.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) - - executable('systemd-hibernate-resume', - 'src/hibernate-resume/hibernate-resume.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) -endif + executable('systemd-hibernate-resume-generator', + 'src/hibernate-resume/hibernate-resume-generator.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) -if conf.get('HAVE_BLKID', 0) == 1 - executable('systemd-gpt-auto-generator', - 'src/gpt-auto-generator/gpt-auto-generator.c', - 'src/basic/blkid-util.h', - include_directories : includes, - link_with : [libshared, - libudev], - dependencies : libblkid, - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) - - exe = executable('systemd-dissect', - 'src/dissect/dissect.c', + executable('systemd-hibernate-resume', + 'src/hibernate-resume/hibernate-resume.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) - public_programs += [exe] +endif + +if conf.get('HAVE_BLKID', 0) == 1 + executable('systemd-gpt-auto-generator', + 'src/gpt-auto-generator/gpt-auto-generator.c', + 'src/basic/blkid-util.h', + include_directories : includes, + link_with : [libshared, + libudev], + dependencies : libblkid, + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) + + exe = executable('systemd-dissect', + 'src/dissect/dissect.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + public_programs += [exe] endif if conf.get('ENABLE_RESOLVED', 0) == 1 - executable('systemd-resolved', - systemd_resolved_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads, - libm, - libidn], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('systemd-resolve', - systemd_resolve_sources, + executable('systemd-resolved', + systemd_resolved_sources, include_directories : includes, link_with : [libshared], dependencies : [threads, libm, libidn], install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] + install : true, + install_dir : rootlibexecdir) + + exe = executable('systemd-resolve', + systemd_resolve_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libm, + libidn], + install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] endif if conf.get('ENABLE_LOGIND', 0) == 1 - executable('systemd-logind', - systemd_logind_sources, - include_directories : includes, - link_with : [liblogind_core, - libshared, - libudev], - dependencies : [threads, - libacl], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('loginctl', - loginctl_sources, + executable('systemd-logind', + systemd_logind_sources, include_directories : includes, - link_with : [libshared, + link_with : [liblogind_core, + libshared, libudev], dependencies : [threads, - liblz4, - libxz], + libacl], install_rpath : rootlibexecdir, install : true, - install_dir : rootbindir) - public_programs += [exe] + install_dir : rootlibexecdir) + + exe = executable('loginctl', + loginctl_sources, + include_directories : includes, + link_with : [libshared, + libudev], + dependencies : [threads, + liblz4, + libxz], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] + + exe = executable('systemd-inhibit', + 'src/login/inhibit.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] + + if conf.get('HAVE_PAM', 0) == 1 + version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym) + pam_systemd = shared_library( + 'pam_systemd', + pam_systemd_c, + name_prefix : '', + include_directories : includes, + link_args : ['-shared', + '-Wl,--version-script=' + version_script_arg], + link_with : [libsystemd_internal, + libshared_static], + dependencies : [threads, + libpam, + libpam_misc], + link_depends : pam_systemd_sym, + install : true, + install_dir : pamlibdir) + + test('dlopen-pam_systemd', + test_dlopen, + args : [pam_systemd.full_path()]) # path to dlopen must include a slash + endif +endif - exe = executable('systemd-inhibit', - 'src/login/inhibit.c', +if conf.get('HAVE_PAM', 0) == 1 + executable('systemd-user-sessions', + 'src/user-sessions/user-sessions.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, install : true, - install_dir : rootbindir) - public_programs += [exe] - - if conf.get('HAVE_PAM', 0) == 1 - version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym) - pam_systemd = shared_library( - 'pam_systemd', - pam_systemd_c, - name_prefix : '', - include_directories : includes, - link_args : ['-shared', - '-Wl,--version-script=' + version_script_arg], - link_with : [libsystemd_internal, - libshared_static], - dependencies : [threads, - libpam, - libpam_misc], - link_depends : pam_systemd_sym, - install : true, - install_dir : pamlibdir) - - test('dlopen-pam_systemd', - test_dlopen, - args : [pam_systemd.full_path()]) # path to dlopen must include a slash - endif -endif - -if conf.get('HAVE_PAM', 0) == 1 - executable('systemd-user-sessions', - 'src/user-sessions/user-sessions.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + install_dir : rootlibexecdir) endif if conf.get('ENABLE_EFI', 0) == 1 and conf.get('HAVE_BLKID', 0) == 1 - exe = executable('bootctl', - 'src/boot/bootctl.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libblkid], - install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] + exe = executable('bootctl', + 'src/boot/bootctl.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libblkid], + install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] endif exe = executable('systemd-socket-activate', 'src/activate/activate.c', @@ -1408,25 +1410,25 @@ exe = executable('systemctl', 'src/systemctl/systemctl.c', public_programs += [exe] if conf.get('ENABLE_BACKLIGHT', 0) == 1 - executable('systemd-backlight', - 'src/backlight/backlight.c', - include_directories : includes, - link_with : [libshared, - libudev], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-backlight', + 'src/backlight/backlight.c', + include_directories : includes, + link_with : [libshared, + libudev], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) endif if conf.get('ENABLE_RFKILL', 0) == 1 - executable('systemd-rfkill', - 'src/rfkill/rfkill.c', - include_directories : includes, - link_with : [libshared, - libudev], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-rfkill', + 'src/rfkill/rfkill.c', + include_directories : includes, + link_with : [libshared, + libudev], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) endif executable('systemd-system-update-generator', @@ -1438,323 +1440,323 @@ executable('systemd-system-update-generator', install_dir : systemgeneratordir) if conf.get('HAVE_LIBCRYPTSETUP', 0) == 1 - executable('systemd-cryptsetup', - 'src/cryptsetup/cryptsetup.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - executable('systemd-cryptsetup-generator', - 'src/cryptsetup/cryptsetup-generator.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup], - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) - - executable('systemd-veritysetup', - 'src/veritysetup/veritysetup.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - executable('systemd-veritysetup-generator', - 'src/veritysetup/veritysetup-generator.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcryptsetup], - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) + executable('systemd-cryptsetup', + 'src/cryptsetup/cryptsetup.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libcryptsetup], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + executable('systemd-cryptsetup-generator', + 'src/cryptsetup/cryptsetup-generator.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libcryptsetup], + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) + + executable('systemd-veritysetup', + 'src/veritysetup/veritysetup.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libcryptsetup], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + executable('systemd-veritysetup-generator', + 'src/veritysetup/veritysetup-generator.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libcryptsetup], + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) endif if conf.get('HAVE_SYSV_COMPAT', 0) == 1 - executable('systemd-sysv-generator', - 'src/sysv-generator/sysv-generator.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) - - executable('systemd-rc-local-generator', - 'src/rc-local-generator/rc-local-generator.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) + executable('systemd-sysv-generator', + 'src/sysv-generator/sysv-generator.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) + + executable('systemd-rc-local-generator', + 'src/rc-local-generator/rc-local-generator.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) endif if conf.get('ENABLE_HOSTNAMED', 0) == 1 - executable('systemd-hostnamed', - 'src/hostname/hostnamed.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('hostnamectl', - 'src/hostname/hostnamectl.c', + executable('systemd-hostnamed', + 'src/hostname/hostnamed.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] + install : true, + install_dir : rootlibexecdir) + + exe = executable('hostnamectl', + 'src/hostname/hostnamectl.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] endif if conf.get('ENABLE_LOCALED', 0) == 1 - if conf.get('HAVE_XKBCOMMON', 0) == 1 - # logind will load libxkbcommon.so dynamically on its own - deps = [libdl] - else - deps = [] - endif - - executable('systemd-localed', - systemd_localed_sources, - include_directories : includes, - link_with : [libshared], - dependencies : deps, - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('localectl', - localectl_sources, + if conf.get('HAVE_XKBCOMMON', 0) == 1 + # logind will load libxkbcommon.so dynamically on its own + deps = [libdl] + else + deps = [] + endif + + executable('systemd-localed', + systemd_localed_sources, include_directories : includes, link_with : [libshared], + dependencies : deps, install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] + install : true, + install_dir : rootlibexecdir) + + exe = executable('localectl', + localectl_sources, + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] endif if conf.get('ENABLE_TIMEDATED', 0) == 1 - executable('systemd-timedated', - 'src/timedate/timedated.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('timedatectl', - 'src/timedate/timedatectl.c', + executable('systemd-timedated', + 'src/timedate/timedated.c', include_directories : includes, - install_rpath : rootlibexecdir, link_with : [libshared], - install : true) - public_programs += [exe] -endif + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) -if conf.get('ENABLE_TIMESYNCD', 0) == 1 - executable('systemd-timesyncd', - systemd_timesyncd_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads, - libm], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + exe = executable('timedatectl', + 'src/timedate/timedatectl.c', + include_directories : includes, + install_rpath : rootlibexecdir, + link_with : [libshared], + install : true) + public_programs += [exe] endif -if conf.get('ENABLE_MACHINED', 0) == 1 - executable('systemd-machined', - systemd_machined_sources, - include_directories : includes, - link_with : [libmachine_core, - libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('machinectl', - 'src/machine/machinectl.c', +if conf.get('ENABLE_TIMESYNCD', 0) == 1 + executable('systemd-timesyncd', + systemd_timesyncd_sources, include_directories : includes, link_with : [libshared], dependencies : [threads, - libxz, - liblz4], + libm], install_rpath : rootlibexecdir, install : true, - install_dir : rootbindir) - public_programs += [exe] + install_dir : rootlibexecdir) endif -if conf.get('ENABLE_IMPORTD', 0) == 1 - executable('systemd-importd', - systemd_importd_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - systemd_pull = executable('systemd-pull', - systemd_pull_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [libcurl, - libz, - libbzip2, - libxz, - libgcrypt], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - systemd_import = executable('systemd-import', - systemd_import_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [libcurl, - libz, - libbzip2, - libxz], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - systemd_export = executable('systemd-export', - systemd_export_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [libcurl, - libz, - libbzip2, - libxz], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - public_programs += [systemd_pull, systemd_import, systemd_export] +if conf.get('ENABLE_MACHINED', 0) == 1 + executable('systemd-machined', + systemd_machined_sources, + include_directories : includes, + link_with : [libmachine_core, + libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + exe = executable('machinectl', + 'src/machine/machinectl.c', + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libxz, + liblz4], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] endif -if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 - exe = executable('systemd-journal-upload', - systemd_journal_upload_sources, +if conf.get('ENABLE_IMPORTD', 0) == 1 + executable('systemd-importd', + systemd_importd_sources, include_directories : includes, link_with : [libshared], - dependencies : [threads, - libcurl, - libgnutls, - libxz, - liblz4], + dependencies : [threads], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) - public_programs += [exe] + + systemd_pull = executable('systemd-pull', + systemd_pull_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [libcurl, + libz, + libbzip2, + libxz, + libgcrypt], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + systemd_import = executable('systemd-import', + systemd_import_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [libcurl, + libz, + libbzip2, + libxz], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + systemd_export = executable('systemd-export', + systemd_export_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [libcurl, + libz, + libbzip2, + libxz], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + public_programs += [systemd_pull, systemd_import, systemd_export] +endif + +if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 + exe = executable('systemd-journal-upload', + systemd_journal_upload_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libcurl, + libgnutls, + libxz, + liblz4], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + public_programs += [exe] endif if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 - s_j_remote = executable('systemd-journal-remote', - systemd_journal_remote_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads, - libmicrohttpd, - libgnutls, - libxz, - liblz4], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - s_j_gatewayd = executable('systemd-journal-gatewayd', - systemd_journal_gatewayd_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads, - libmicrohttpd, - libgnutls, - libxz, - liblz4], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - public_programs += [s_j_remote, s_j_gatewayd] + s_j_remote = executable('systemd-journal-remote', + systemd_journal_remote_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libmicrohttpd, + libgnutls, + libxz, + liblz4], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + s_j_gatewayd = executable('systemd-journal-gatewayd', + systemd_journal_gatewayd_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libmicrohttpd, + libgnutls, + libxz, + liblz4], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + public_programs += [s_j_remote, s_j_gatewayd] endif if conf.get('ENABLE_COREDUMP', 0) == 1 - executable('systemd-coredump', - systemd_coredump_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [threads, - libacl, - libdw, - libxz, - liblz4], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - exe = executable('coredumpctl', - coredumpctl_sources, + executable('systemd-coredump', + systemd_coredump_sources, include_directories : includes, link_with : [libshared], dependencies : [threads, + libacl, + libdw, libxz, liblz4], install_rpath : rootlibexecdir, - install : true) - public_programs += [exe] + install : true, + install_dir : rootlibexecdir) + + exe = executable('coredumpctl', + coredumpctl_sources, + include_directories : includes, + link_with : [libshared], + dependencies : [threads, + libxz, + liblz4], + install_rpath : rootlibexecdir, + install : true) + public_programs += [exe] endif if conf.get('ENABLE_BINFMT', 0) == 1 - exe = executable('systemd-binfmt', - 'src/binfmt/binfmt.c', + exe = executable('systemd-binfmt', + 'src/binfmt/binfmt.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + public_programs += [exe] + + meson.add_install_script('sh', '-c', + mkdir_p.format(binfmtdir)) + meson.add_install_script('sh', '-c', + mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) +endif + +if conf.get('ENABLE_VCONSOLE', 0) == 1 + executable('systemd-vconsole-setup', + 'src/vconsole/vconsole-setup.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) - public_programs += [exe] - - meson.add_install_script('sh', '-c', - mkdir_p.format(binfmtdir)) - meson.add_install_script('sh', '-c', - mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) -endif - -if conf.get('ENABLE_VCONSOLE', 0) == 1 - executable('systemd-vconsole-setup', - 'src/vconsole/vconsole-setup.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) endif if conf.get('ENABLE_RANDOMSEED', 0) == 1 - executable('systemd-random-seed', - 'src/random-seed/random-seed.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-random-seed', + 'src/random-seed/random-seed.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) endif if conf.get('ENABLE_FIRSTBOOT', 0) == 1 - executable('systemd-firstboot', - 'src/firstboot/firstboot.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libcrypt], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootbindir) + executable('systemd-firstboot', + 'src/firstboot/firstboot.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libcrypt], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) endif executable('systemd-remount-fs', @@ -1957,48 +1959,48 @@ exe = executable('busctl', public_programs += [exe] if conf.get('ENABLE_SYSUSERS', 0) == 1 - exe = executable('systemd-sysusers', - 'src/sysusers/sysusers.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootbindir) - public_programs += [exe] + exe = executable('systemd-sysusers', + 'src/sysusers/sysusers.c', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] endif if conf.get('ENABLE_TMPFILES', 0) == 1 - exe = executable('systemd-tmpfiles', - 'src/tmpfiles/tmpfiles.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libacl], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootbindir) - public_programs += [exe] + exe = executable('systemd-tmpfiles', + 'src/tmpfiles/tmpfiles.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libacl], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] endif if conf.get('ENABLE_HWDB', 0) == 1 - exe = executable('systemd-hwdb', - 'src/hwdb/hwdb.c', - 'src/libsystemd/sd-hwdb/hwdb-internal.h', + exe = executable('systemd-hwdb', + 'src/hwdb/hwdb.c', + 'src/libsystemd/sd-hwdb/hwdb-internal.h', + include_directories : includes, + link_with : [libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootbindir) + public_programs += [exe] +endif + +if conf.get('ENABLE_QUOTACHECK', 0) == 1 + executable('systemd-quotacheck', + 'src/quotacheck/quotacheck.c', include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, install : true, - install_dir : rootbindir) - public_programs += [exe] -endif - -if conf.get('ENABLE_QUOTACHECK', 0) == 1 - executable('systemd-quotacheck', - 'src/quotacheck/quotacheck.c', - include_directories : includes, - link_with : [libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + install_dir : rootlibexecdir) endif exe = executable('systemd-socket-proxyd', @@ -2072,19 +2074,19 @@ executable('systemd-update-utmp', install_dir : rootlibexecdir) if conf.get('HAVE_KMOD', 0) == 1 - executable('systemd-modules-load', - 'src/modules-load/modules-load.c', - include_directories : includes, - link_with : [libshared], - dependencies : [libkmod], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-modules-load', + 'src/modules-load/modules-load.c', + include_directories : includes, + link_with : [libshared], + dependencies : [libkmod], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) - meson.add_install_script('sh', '-c', - mkdir_p.format(modulesloaddir)) - meson.add_install_script('sh', '-c', - mkdir_p.format(join_paths(sysconfdir, 'modules-load.d'))) + meson.add_install_script('sh', '-c', + mkdir_p.format(modulesloaddir)) + meson.add_install_script('sh', '-c', + mkdir_p.format(join_paths(sysconfdir, 'modules-load.d'))) endif exe = executable('systemd-nspawn', @@ -2106,26 +2108,26 @@ exe = executable('systemd-nspawn', public_programs += [exe] if conf.get('ENABLE_NETWORKD', 0) == 1 - executable('systemd-networkd', - systemd_networkd_sources, - include_directories : includes, - link_with : [libnetworkd_core, - libfirewall, - libsystemd_network, - libudev_internal, - libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) - - executable('systemd-networkd-wait-online', - systemd_networkd_wait_online_sources, - include_directories : includes, - link_with : [libnetworkd_core, - libshared], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-networkd', + systemd_networkd_sources, + include_directories : includes, + link_with : [libnetworkd_core, + libfirewall, + libsystemd_network, + libudev_internal, + libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) + + executable('systemd-networkd-wait-online', + systemd_networkd_wait_online_sources, + include_directories : includes, + link_with : [libnetworkd_core, + libshared], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) endif exe = executable('networkctl', @@ -2141,67 +2143,67 @@ public_programs += [exe] ############################################################ foreach tuple : tests - sources = tuple[0] - link_with = tuple[1].length() > 0 ? tuple[1] : [libshared] - dependencies = tuple[2] - condition = tuple.length() >= 4 ? tuple[3] : '' - type = tuple.length() >= 5 ? tuple[4] : '' - defs = tuple.length() >= 6 ? tuple[5] : [] - incs = tuple.length() >= 7 ? tuple[6] : includes - timeout = 30 - - name = sources[0].split('/')[-1].split('.')[0] - if type.startswith('timeout=') - timeout = type.split('=')[1].to_int() - type = '' - endif - - if condition == '' or conf.get(condition, 0) == 1 - install = install_tests and type == '' - - exe = executable( - name, - sources, - include_directories : incs, - link_with : link_with, - dependencies : dependencies, - c_args : defs, - install_rpath : rootlibexecdir, - install : install, - install_dir : testsdir) - - if type == 'manual' - message('@0@ is a manual test'.format(name)) - elif type == 'unsafe' and want_tests != 'unsafe' - message('@0@ is an unsafe test'.format(name)) - else - test(name, exe, - env : test_env, - timeout : timeout) - endif - else - message('Not compiling @0@ because @1@ is not true'.format(name, condition)) - endif + sources = tuple[0] + link_with = tuple[1].length() > 0 ? tuple[1] : [libshared] + dependencies = tuple[2] + condition = tuple.length() >= 4 ? tuple[3] : '' + type = tuple.length() >= 5 ? tuple[4] : '' + defs = tuple.length() >= 6 ? tuple[5] : [] + incs = tuple.length() >= 7 ? tuple[6] : includes + timeout = 30 + + name = sources[0].split('/')[-1].split('.')[0] + if type.startswith('timeout=') + timeout = type.split('=')[1].to_int() + type = '' + endif + + if condition == '' or conf.get(condition, 0) == 1 + install = install_tests and type == '' + + exe = executable( + name, + sources, + include_directories : incs, + link_with : link_with, + dependencies : dependencies, + c_args : defs, + install_rpath : rootlibexecdir, + install : install, + install_dir : testsdir) + + if type == 'manual' + message('@0@ is a manual test'.format(name)) + elif type == 'unsafe' and want_tests != 'unsafe' + message('@0@ is an unsafe test'.format(name)) + else + test(name, exe, + env : test_env, + timeout : timeout) + endif + else + message('Not compiling @0@ because @1@ is not true'.format(name, condition)) + endif endforeach test_libsystemd_sym = executable( - 'test-libsystemd-sym', - test_libsystemd_sym_c, - include_directories : includes, - link_with : [libsystemd], - install : install_tests, - install_dir : testsdir) + 'test-libsystemd-sym', + test_libsystemd_sym_c, + include_directories : includes, + link_with : [libsystemd], + install : install_tests, + install_dir : testsdir) test('test-libsystemd-sym', test_libsystemd_sym) test_libudev_sym = executable( - 'test-libudev-sym', - test_libudev_sym_c, - include_directories : includes, - c_args : ['-Wno-deprecated-declarations'], - link_with : [libudev], - install : install_tests, - install_dir : testsdir) + 'test-libudev-sym', + test_libudev_sym_c, + include_directories : includes, + c_args : ['-Wno-deprecated-declarations'], + link_with : [libudev], + install : install_tests, + install_dir : testsdir) test('test-libudev-sym', test_libudev_sym) @@ -2253,33 +2255,33 @@ meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir)) meson_check_help = find_program('tools/meson-check-help.sh') foreach exec : public_programs - name = exec.full_path().split('/')[-1] - test('check-help-' + name, - meson_check_help, - args : [exec.full_path()]) + name = exec.full_path().split('/')[-1] + test('check-help-' + name, + meson_check_help, + args : [exec.full_path()]) endforeach ############################################################ if git.found() and etags.found() - all_files = run_command( - git, - ['--git-dir=@0@/.git'.format(meson.source_root()), - 'ls-files', - ':/*.[ch]']) - all_files = files(all_files.stdout().split()) + all_files = run_command( + git, + ['--git-dir=@0@/.git'.format(meson.source_root()), + 'ls-files', + ':/*.[ch]']) + all_files = files(all_files.stdout().split()) - custom_target( - 'TAGS', - output : 'TAGS', - input : all_files, - command : [etags, '-o', '@OUTPUT@'] + all_files) + custom_target( + 'TAGS', + output : 'TAGS', + input : all_files, + command : [etags, '-o', '@OUTPUT@'] + all_files) endif if git.found() - meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh') - custom_target( - 'git-contrib', - output : 'git-contrib', - command : [meson_git_contrib_sh]) + meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh') + custom_target( + 'git-contrib', + output : 'git-contrib', + command : [meson_git_contrib_sh]) endif |