X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=meson.build;h=cdb4dedc880eabd2f0e5177cdac9894dd5b6be6a;hb=a116fae17a845c305cd2da0c1ecdc3f406ceb8db;hp=90b7dc1e30b9fc305b98552b5b9570e20ebf9ea3;hpb=04164a6f685a6870e81190ee7c287f9195d16e6c;p=elogind.git diff --git a/meson.build b/meson.build index 90b7dc1e3..cdb4dedc8 100644 --- a/meson.build +++ b/meson.build @@ -1,22 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1+ -# -# Copyright 2017 Zbigniew Jędrzejewski-Szmek -# -# elogind is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# elogind is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with elogind; If not, see . project('elogind', 'c', - version : '238', + version : '239', license : 'LGPLv2+', default_options: [ 'c_std=gnu99', @@ -24,17 +9,17 @@ project('elogind', 'c', 'sysconfdir=/etc', 'localstatedir=/var', ], - meson_version : '>= 0.41', + meson_version : '>= 0.44', ) #if 0 /// UNNEEDED by elogind - libudev is external -# libsystemd_version = '0.22.0' -# libudev_version = '1.6.10' +# libsystemd_version = '0.23.0' +# libudev_version = '1.6.11' #else -libelogind_version = '0.20.0' +libelogind_version = '0.22.0' #endif // 0 -# We need the same data in three different formats, ugh! +# We need the same data in two different formats, ugh! # Also, for hysterical reasons, we use different variable # names, sometimes. Not all variables are included in every # set. Ugh, ugh, ugh! @@ -50,11 +35,9 @@ substs.set('PACKAGE_URL', 'https://github.com/elogind/elogind') #endif // 0 substs.set('PACKAGE_VERSION', meson.project_version()) -m4_defines = [] - ##################################################################### #if 0 /// elogind does not need this -# +# # # Try to install the git pre-commit hook # git_hook = run_command(join_paths(meson.source_root(), 'tools/add-git-hook.sh')) # if git_hook.returncode() == 0 @@ -97,10 +80,8 @@ endif #if 0 /// UNNEEDED by elogind # sysvinit_path = get_option('sysvinit-path') # sysvrcnd_path = get_option('sysvrcnd-path') -# have = sysvinit_path != '' and sysvrcnd_path != '' -# conf.set10('HAVE_SYSV_COMPAT', have, +# conf.set10('HAVE_SYSV_COMPAT', sysvinit_path != '' and sysvrcnd_path != '', # description : 'SysV init scripts and rcN.d links are supported') -# m4_defines += have ? ['-DHAVE_SYSV_COMPAT'] : [] #endif // 0 # join_paths ignore the preceding arguments if an absolute component is @@ -181,7 +162,8 @@ modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d') # systemdstatedir = join_paths(localstatedir, 'lib/systemd') # catalogstatedir = join_paths(systemdstatedir, 'catalog') # randomseeddir = join_paths(localstatedir, 'lib/systemd') -# +# profiledir = join_paths(rootlibexecdir, 'portable', 'profile') +# # docdir = get_option('docdir') # if docdir == '' # docdir = join_paths(datadir, 'doc/systemd') @@ -244,9 +226,9 @@ conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH', join_paths(pkgsysc # conf.set_quoted('SYSTEM_SYSVRCND_PATH', sysvrcnd_path) # conf.set_quoted('RC_LOCAL_SCRIPT_PATH_START', get_option('rc-local')) # conf.set_quoted('RC_LOCAL_SCRIPT_PATH_STOP', get_option('halt-local')) -# +# # conf.set('ANSI_OK_COLOR', 'ANSI_' + get_option('ok-color').underscorify().to_upper()) -# +# # conf.set_quoted('USER_CONFIG_UNIT_PATH', join_paths(pkgsysconfdir, 'user')) # conf.set_quoted('USER_DATA_UNIT_PATH', userunitdir) # conf.set_quoted('CERTIFICATE_ROOT', get_option('certificate-root')) @@ -296,7 +278,7 @@ conf.set_quoted('ROOTLIBEXECDIR', rootlibexecdir) # conf.set_quoted('USER_KEYRING_PATH', join_paths(pkgsysconfdir, 'import-pubring.gpg')) # conf.set_quoted('DOCUMENT_ROOT', join_paths(pkgdatadir, 'gatewayd')) # conf.set('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default ? 'true' : 'false') -# conf.set_quoted('MEMORY_ACCOUNTING_DEFAULT_ON_OFF', memory_accounting_default ? 'on' : 'off') +# conf.set_quoted('MEMORY_ACCOUNTING_DEFAULT_YES_NO', memory_accounting_default ? 'yes' : 'no') #endif // 0 conf.set_quoted('ABS_BUILD_DIR', meson.build_root()) @@ -321,12 +303,14 @@ substs.set('rootlibexecdir', rootlibexecdir) substs.set('udevrulesdir', udevrulesdir) substs.set('udevlibexecdir', udevlibexecdir) #if 0 /// UNNEEDED by elogind +# substs.set('environmentdir', environmentdir) # substs.set('catalogdir', catalogdir) # substs.set('tmpfilesdir', tmpfilesdir) # substs.set('sysusersdir', sysusersdir) # substs.set('sysctldir', sysctldir) # substs.set('binfmtdir', binfmtdir) # substs.set('modulesloaddir', modulesloaddir) +# substs.set('modprobedir', modprobedir) # substs.set('systemgeneratordir', systemgeneratordir) # substs.set('usergeneratordir', usergeneratordir) # substs.set('systemenvgeneratordir', systemenvgeneratordir) @@ -378,57 +362,79 @@ endif fuzzer_build = false #endif // 0 -foreach arg : ['-Wextra', - '-Werror=undef', - '-Wlogical-op', - '-Wmissing-include-dirs', - '-Wold-style-definition', - '-Wpointer-arith', - '-Winit-self', - '-Wdeclaration-after-statement', - '-Wfloat-equal', - '-Wsuggest-attribute=noreturn', - '-Werror=missing-prototypes', - '-Werror=implicit-function-declaration', - '-Werror=missing-declarations', - '-Werror=return-type', - '-Werror=incompatible-pointer-types', - '-Werror=format=2', - '-Wstrict-prototypes', - '-Wredundant-decls', - '-Wmissing-noreturn', - '-Wimplicit-fallthrough=5', - '-Wshadow', - '-Wendif-labels', - '-Wstrict-aliasing=2', - '-Wwrite-strings', - '-Werror=overflow', - '-Wdate-time', - '-Wnested-externs', - '-ffast-math', - '-fno-common', - '-fdiagnostics-show-option', - '-fno-strict-aliasing', - '-fvisibility=hidden', - '-fstack-protector', - '-fstack-protector-strong', - '--param=ssp-buffer-size=4', - ] - if cc.has_argument(arg) - add_project_arguments(arg, language : 'c') - endif -endforeach +possible_cc_flags = [ + '-Wextra', + '-Werror=undef', + '-Wlogical-op', + '-Wmissing-include-dirs', + '-Wold-style-definition', + '-Wpointer-arith', + '-Winit-self', + '-Wfloat-equal', + '-Wsuggest-attribute=noreturn', + '-Werror=missing-prototypes', + '-Werror=implicit-function-declaration', + '-Werror=missing-declarations', + '-Werror=return-type', + '-Werror=incompatible-pointer-types', + '-Werror=format=2', + '-Wstrict-prototypes', + '-Wredundant-decls', + '-Wmissing-noreturn', + '-Wimplicit-fallthrough=5', + '-Wshadow', + '-Wendif-labels', + '-Wstrict-aliasing=2', + '-Wwrite-strings', + '-Werror=overflow', + '-Werror=shift-count-overflow', + '-Werror=shift-overflow=2', + '-Wdate-time', + '-Wnested-externs', + '-ffast-math', + '-fno-common', + '-fdiagnostics-show-option', + '-fno-strict-aliasing', + '-fvisibility=hidden', + '-fstack-protector', + '-fstack-protector-strong', + '--param=ssp-buffer-size=4', +] + +# --as-needed and --no-undefined are provided by meson by default, +# run mesonconf to see what is enabled +possible_link_flags = [ + '-Wl,-z,relro', + '-Wl,-z,now', +] # the oss-fuzz fuzzers are not built with -fPIE, so don't # enable it when we are linking against them if not fuzzer_build - if cc.has_argument('-fPIE') - add_project_arguments('-fPIE', language : 'c') - endif + possible_cc_flags += '-fPIE' + possible_link_flags += '-pie' +endif + +if cc.get_id() == 'clang' + possible_cc_flags += [ + '-Wno-typedef-redefinition', + '-Wno-gnu-variable-sized-type-not-at-end', + ] +endif + +if get_option('buildtype') != 'debug' + possible_cc_flags += [ + '-ffunction-sections', + '-fdata-sections', + ] + + possible_link_flags += '-Wl,--gc-sections' endif +add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : 'c') + # "negative" arguments: gcc on purpose does not return an error for "-Wno-" -# arguments, just emits a warnings. So test for the "positive" version instead. +# arguments, just emits a warning. So test for the "positive" version instead. foreach arg : ['unused-parameter', 'missing-field-initializers', 'unused-result', @@ -453,67 +459,18 @@ if cc.compiles(''' 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 -endif - link_test_c = files('tools/meson-link-test.c') -# --as-needed and --no-undefined are provided by meson by default, -# run mesonconf to see what is enabled -foreach arg : ['-Wl,-z,relro', - '-Wl,-z,now', - '-pie', - ] - +foreach arg : possible_link_flags have = run_command(check_compilation_sh, cc.cmd_array(), '-x', 'c', arg, '-include', link_test_c).returncode() == 0 message('Linking with @0@ supported: @1@'.format(arg, have ? 'yes' : 'no')) - if have and (arg != '-pie' or not fuzzer_build) - add_project_link_arguments(arg, language : 'c') - endif -endforeach - -# Check if various sanitizers are supported -sanitizers = [] -foreach arg : ['address'] - - have = run_command(check_compilation_sh, - cc.cmd_array(), '-x', 'c', - '-fsanitize=@0@'.format(arg), - '-include', link_test_c).returncode() == 0 - message('@0@ sanitizer supported: @1@'.format(arg, have ? 'yes' : 'no')) if have - sanitizers += arg + add_project_link_arguments(arg, language : 'c') endif endforeach -if get_option('buildtype') != 'debug' - foreach arg : ['-ffunction-sections', - '-fdata-sections'] - if cc.has_argument(arg) - add_project_arguments(arg, language : 'c') - endif - endforeach - - foreach arg : ['-Wl,--gc-sections'] - have = run_command(check_compilation_sh, - cc.cmd_array(), '-x', 'c', arg, - '-include', link_test_c).returncode() == 0 - message('Linking with @0@ supported: @1@'.format(arg, have ? 'yes' : 'no')) - if have - add_project_link_arguments(arg, language : 'c') - endif - endforeach -endif - cpp = ' '.join(cc.cmd_array()) + ' -E' ##################################################################### @@ -634,12 +591,13 @@ m4 = find_program('m4') stat = find_program('stat') git = find_program('git', required : false) env = find_program('env') +perl = find_program('perl', required : false) #if 0 /// elogind does not use this but needs a tool to symlink its installed headers. # meson_make_symlink = meson.source_root() + '/tools/meson-make-symlink.sh' #else /// Needed by elogind meson_symlink_headers = meson.source_root() + '/tools/meson-symlink_headers.sh' -#endif // 1 +#endif // 0 mkdir_p = 'mkdir -p $DESTDIR/@0@' #if 0 /// unneeded by elogind # test_efi_create_disk_sh = find_program('test/test-efi-create-disk.sh') @@ -651,7 +609,6 @@ mkdir_p = 'mkdir -p $DESTDIR/@0@' #if 0 /// elogind has a bit different list and some adaptions # progs = [['quotaon', '/usr/sbin/quotaon' ], # ['quotacheck', '/usr/sbin/quotacheck' ], -# ['kill', '/usr/bin/kill' ], # ['kmod', '/usr/bin/kmod' ], # ['kexec', '/usr/sbin/kexec' ], # ['sulogin', '/usr/sbin/sulogin' ], @@ -685,8 +642,9 @@ endforeach #if 0 /// unneeded by elogind # conf.set_quoted('TELINIT', get_option('telinit-path')) +# # if run_command('ln', '--relative', '--help').returncode() != 0 -# error('ln does not support --relative') +# error('ln does not support --relative (added in coreutils 8.16)') # endif #endif // 0 @@ -823,7 +781,7 @@ message('maximum system GID is @0@'.format(system_gid_max)) # conf.set('DYNAMIC_UID_MAX', dynamic_uid_max) # substs.set('dynamicuidmin', dynamic_uid_min) # substs.set('dynamicuidmax', dynamic_uid_max) -# +# # container_uid_base_min = get_option('container-uid-base-min').to_int() # container_uid_base_max = get_option('container-uid-base-max').to_int() # conf.set('CONTAINER_UID_BASE_MIN', container_uid_base_min) @@ -839,18 +797,18 @@ getent_result = run_command('getent', 'passwd', '65534') if getent_result.returncode() == 0 name = getent_result.stdout().split(':')[0] if name != nobody_user - message('WARNING:\n' + - ' The local user with the UID 65534 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) + - ' Your build will result in an user table setup that is incompatible with the local system.') + warning('\n' + + 'The local user with the UID 65534 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) + + 'Your build will result in an user table setup that is incompatible with the local system.') endif endif id_result = run_command('id', '-u', nobody_user) if id_result.returncode() == 0 id = id_result.stdout().to_int() if id != 65534 - message('WARNING:\n' + - ' The local user with the configured user name "@0@" of the nobody user does not have UID 65534 (it has @1@).\n'.format(nobody_user, id) + - ' Your build will result in an user table setup that is incompatible with the local system.') + warning('\n' + + 'The local user with the configured user name "@0@" of the nobody user does not have UID 65534 (it has @1@).\n'.format(nobody_user, id) + + 'Your build will result in an user table setup that is incompatible with the local system.') endif endif @@ -858,24 +816,24 @@ getent_result = run_command('getent', 'group', '65534') if getent_result.returncode() == 0 name = getent_result.stdout().split(':')[0] if name != nobody_group - message('WARNING:\n' + - ' The local group with the GID 65534 does not match the configured group name "@0@" of the nobody group (its name is @1@).\n'.format(nobody_group, name) + - ' Your build will result in an group table setup that is incompatible with the local system.') + warning('\n' + + 'The local group with the GID 65534 does not match the configured group name "@0@" of the nobody group (its name is @1@).\n'.format(nobody_group, name) + + 'Your build will result in an group table setup that is incompatible with the local system.') endif endif id_result = run_command('id', '-g', nobody_group) if id_result.returncode() == 0 id = id_result.stdout().to_int() if id != 65534 - message('WARNING:\n' + - ' The local group with the configured group name "@0@" of the nobody group does not have UID 65534 (it has @1@).\n'.format(nobody_group, id) + - ' Your build will result in an group table setup that is incompatible with the local system.') + warning('\n' + + 'The local group with the configured group name "@0@" of the nobody group does not have UID 65534 (it has @1@).\n'.format(nobody_group, id) + + 'Your build will result in an group table setup that is incompatible with the local system.') endif endif if nobody_user != nobody_group and not (nobody_user == 'nobody' and nobody_group == 'nogroup') - message('WARNING:\n' + - ' The configured user name "@0@" and group name "@0@" of the nobody user/group are not equivalent.\n'.format(nobody_user, nobody_group) + - ' Please re-check that both "nobody-user" and "nobody-group" options are correctly set.') + warning('\n' + + 'The configured user name "@0@" and group name "@0@" of the nobody user/group are not equivalent.\n'.format(nobody_user, nobody_group) + + 'Please re-check that both "nobody-user" and "nobody-group" options are correctly set.') endif conf.set_quoted('NOBODY_USER_NAME', nobody_user) @@ -895,28 +853,24 @@ substs.set('TTY_GID', tty_gid) # users_gid = '-' # endif # substs.set('USERS_GID', users_gid) -# -# if get_option('adm-group') -# m4_defines += ['-DENABLE_ADM_GROUP'] -# endif -# -# if get_option('wheel-group') -# m4_defines += ['-DENABLE_WHEEL_GROUP'] -# endif -# +# +# conf.set10('ENABLE_ADM_GROUP', get_option('adm-group')) +# conf.set10('ENABLE_WHEEL_GROUP', get_option('wheel-group')) +# # substs.set('DEV_KVM_MODE', get_option('dev-kvm-mode')) # substs.set('GROUP_RENDER_MODE', get_option('group-render-mode')) #endif // 0 kill_user_processes = get_option('default-kill-user-processes') conf.set10('KILL_USER_PROCESSES', kill_user_processes) +conf.set_quoted('KILL_USER_PROCESSES_YES_NO', kill_user_processes ? 'yes' : 'no') substs.set('KILL_USER_PROCESSES', kill_user_processes ? 'yes' : 'no') #if 0 /// UNNEEDED by elogind # dns_servers = get_option('dns-servers') # conf.set_quoted('DNS_SERVERS', dns_servers) # substs.set('DNS_SERVERS', dns_servers) -# +# # ntp_servers = get_option('ntp-servers') # conf.set_quoted('NTP_SERVERS', ntp_servers) # substs.set('NTP_SERVERS', ntp_servers) @@ -929,33 +883,32 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) # substs.set('DEBUGTTY', get_option('debug-tty')) #endif // 0 -debug = get_option('debug') enable_debug_hashmap = false enable_debug_mmap_cache = false #if 1 /// additional elogind debug mode enable_debug_elogind = false #endif // 1 -if debug != '' - foreach name : debug.split(',') - if name == 'hashmap' - enable_debug_hashmap = true - elif name == 'mmap-cache' - enable_debug_mmap_cache = true +foreach name : get_option('debug') + if name == 'hashmap' + enable_debug_hashmap = true + elif name == 'mmap-cache' + enable_debug_mmap_cache = true #if 1 /// additional elogind debug mode - elif name == 'elogind' - enable_debug_elogind = true + elif name == 'elogind' + enable_debug_elogind = true #endif // 1 - else - message('unknown debug option "@0@", ignoring'.format(name)) - endif - endforeach -endif + else + message('unknown debug option "@0@", ignoring'.format(name)) + endif +endforeach conf.set10('ENABLE_DEBUG_HASHMAP', enable_debug_hashmap) conf.set10('ENABLE_DEBUG_MMAP_CACHE', enable_debug_mmap_cache) #if 1 /// additional elogind debug mode conf.set10('ENABLE_DEBUG_ELOGIND', enable_debug_elogind) #endif // 1 +conf.set10('VALGRIND', get_option('valgrind')) + ##################################################################### threads = dependency('threads') @@ -972,9 +925,8 @@ endif #if 0 /// UNNEEDED by elogind # libmount = dependency('mount', -# version : '>= 2.30', -# required : not fuzzer_build) -# +# version : fuzzer_build ? '>= 0' : '>= 2.30') +# # want_seccomp = get_option('seccomp') # if want_seccomp != 'false' and not fuzzer_build # libseccomp = dependency('libseccomp', @@ -989,7 +941,6 @@ endif libseccomp = [] #endif // 0 conf.set10('HAVE_SECCOMP', have) -m4_defines += have ? ['-DHAVE_SECCOMP'] : [] want_selinux = get_option('selinux') if want_selinux != 'false' and not fuzzer_build @@ -1002,7 +953,6 @@ else libselinux = [] endif conf.set10('HAVE_SELINUX', have) -m4_defines += have ? ['-DHAVE_SELINUX'] : [] #if 0 /// UNNEEDED by elogind # want_apparmor = get_option('apparmor') @@ -1018,12 +968,10 @@ m4_defines += have ? ['-DHAVE_SELINUX'] : [] libapparmor = [] #endif // 0 conf.set10('HAVE_APPARMOR', have) -m4_defines += have ? ['-DHAVE_APPARMOR'] : [] 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'] endif want_polkit = get_option('polkit') @@ -1050,7 +998,6 @@ else libacl = [] endif conf.set10('HAVE_ACL', have) -m4_defines += have ? ['-DHAVE_ACL'] : [] want_audit = get_option('audit') if want_audit != 'false' and not fuzzer_build @@ -1072,7 +1019,7 @@ conf.set10('HAVE_AUDIT', have) # libblkid = [] # endif # conf.set10('HAVE_BLKID', have) -# +# # want_kmod = get_option('kmod') # if want_kmod != 'false' and not fuzzer_build # libkmod = dependency('libkmod', @@ -1100,7 +1047,6 @@ else libpam_misc = [] endif conf.set10('HAVE_PAM', have) -m4_defines += have ? ['-DHAVE_PAM'] : [] #if 0 /// UNNEEDED by elogind # want_microhttpd = get_option('microhttpd') @@ -1114,8 +1060,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libmicrohttpd = [] # endif # conf.set10('HAVE_MICROHTTPD', have) -# m4_defines += have ? ['-DHAVE_MICROHTTPD'] : [] -# +# # want_libcryptsetup = get_option('libcryptsetup') # if want_libcryptsetup != 'false' and not fuzzer_build # libcryptsetup = dependency('libcryptsetup', @@ -1127,7 +1072,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libcryptsetup = [] # endif # conf.set10('HAVE_LIBCRYPTSETUP', have) -# +# # want_libcurl = get_option('libcurl') # if want_libcurl != 'false' and not fuzzer_build # libcurl = dependency('libcurl', @@ -1139,14 +1084,13 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libcurl = [] # endif # conf.set10('HAVE_LIBCURL', have) -# m4_defines += have ? ['-DHAVE_LIBCURL'] : [] -# +# # want_libidn = get_option('libidn') # want_libidn2 = get_option('libidn2') # if want_libidn == 'true' and want_libidn2 == 'true' # error('libidn and libidn2 cannot be requested simultaneously') # endif -# +# # if want_libidn != 'false' and want_libidn2 != 'true' and not fuzzer_build # libidn = dependency('libidn', # required : want_libidn == 'true') @@ -1156,7 +1100,6 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libidn = [] # endif # conf.set10('HAVE_LIBIDN', have) -# m4_defines += have ? ['-DHAVE_LIBIDN'] : [] # if not have and want_libidn2 != 'false' and not fuzzer_build # # libidn is used for both libidn and libidn2 objects # libidn = dependency('libidn2', @@ -1166,8 +1109,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # have = false # endif # conf.set10('HAVE_LIBIDN2', have) -# m4_defines += have ? ['-DHAVE_LIBIDN2'] : [] -# +# # want_libiptc = get_option('libiptc') # if want_libiptc != 'false' and not fuzzer_build # libiptc = dependency('libiptc', @@ -1178,8 +1120,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libiptc = [] # endif # conf.set10('HAVE_LIBIPTC', have) -# m4_defines += have ? ['-DHAVE_LIBIPTC'] : [] -# +# # want_qrencode = get_option('qrencode') # if want_qrencode != 'false' and not fuzzer_build # libqrencode = dependency('libqrencode', @@ -1190,7 +1131,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libqrencode = [] # endif # conf.set10('HAVE_QRENCODE', have) -# +# # want_gcrypt = get_option('gcrypt') # if want_gcrypt != 'false' and not fuzzer_build # libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true') @@ -1205,7 +1146,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libgpg_error = [] # endif # conf.set10('HAVE_GCRYPT', have) -# +# # want_gnutls = get_option('gnutls') # if want_gnutls != 'false' and not fuzzer_build # libgnutls = dependency('gnutls', @@ -1217,7 +1158,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libgnutls = [] # endif # conf.set10('HAVE_GNUTLS', have) -# +# # want_elfutils = get_option('elfutils') # if want_elfutils != 'false' and not fuzzer_build # libdw = dependency('libdw', @@ -1228,7 +1169,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libdw = [] # endif # conf.set10('HAVE_ELFUTILS', have) -# +# # want_zlib = get_option('zlib') # if want_zlib != 'false' and not fuzzer_build # libz = dependency('zlib', @@ -1239,7 +1180,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libz = [] # endif # conf.set10('HAVE_ZLIB', have) -# +# # want_bzip2 = get_option('bzip2') # if want_bzip2 != 'false' and not fuzzer_build # libbzip2 = cc.find_library('bz2', @@ -1250,7 +1191,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libbzip2 = [] # endif # conf.set10('HAVE_BZIP2', have) -# +# # want_xz = get_option('xz') # if want_xz != 'false' and not fuzzer_build # libxz = dependency('liblzma', @@ -1261,7 +1202,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libxz = [] # endif # conf.set10('HAVE_XZ', have) -# +# # want_lz4 = get_option('lz4') # if want_lz4 != 'false' and not fuzzer_build # liblz4 = dependency('liblz4', @@ -1272,7 +1213,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # liblz4 = [] # endif # conf.set10('HAVE_LZ4', have) -# +# # want_xkbcommon = get_option('xkbcommon') # if want_xkbcommon != 'false' and not fuzzer_build # libxkbcommon = dependency('xkbcommon', @@ -1356,7 +1297,30 @@ conf.set10('HAVE_DBUS', have) # conf.set('DEFAULT_DNSSEC_MODE', # 'DNSSEC_' + default_dnssec.underscorify().to_upper()) # substs.set('DEFAULT_DNSSEC_MODE', default_dnssec) -# +# +# dns_over_tls = get_option('dns-over-tls') +# if dns_over_tls != 'false' +# have = conf.get('HAVE_GNUTLS') == 1 +# if dns_over_tls == 'true' and not have +# error('DNS-over-TLS support was requested, but dependencies are not available') +# endif +# else +# have = false +# endif +# conf.set10('ENABLE_DNS_OVER_TLS', have) +# +# default_dns_over_tls = get_option('default-dns-over-tls') +# if fuzzer_build +# default_dns_over_tls = 'no' +# endif +# if default_dns_over_tls != 'no' and conf.get('ENABLE_DNS_OVER_TLS') == 0 +# message('default-dns-over-tls cannot be set to opportunistic when DNS-over-TLS support is disabled. Setting default-dns-over-tls to no.') +# default_dns_over_tls = 'no' +# endif +# conf.set('DEFAULT_DNS_OVER_TLS_MODE', +# 'DNS_OVER_TLS_' + default_dns_over_tls.underscorify().to_upper()) +# substs.set('DEFAULT_DNS_OVER_TLS_MODE', default_dns_over_tls) +# # want_importd = get_option('importd') # if want_importd != 'false' # have = (conf.get('HAVE_LIBCURL') == 1 and @@ -1371,7 +1335,7 @@ conf.set10('HAVE_DBUS', have) # have = false # endif # conf.set10('ENABLE_IMPORTD', have) -# +# # want_remote = get_option('remote') # if want_remote != 'false' # have_deps = [conf.get('HAVE_MICROHTTPD') == 1, @@ -1401,6 +1365,7 @@ foreach term : ['utmp', # 'hostnamed', # 'localed', # 'machined', +# 'portabled', # 'networkd', # 'timedated', # 'timesyncd', @@ -1428,9 +1393,12 @@ foreach term : ['utmp', have = get_option(term) name = 'ENABLE_' + term.underscorify().to_upper() conf.set10(name, have) - m4_defines += have ? ['-D' + name] : [] endforeach +#if 0 /// UNNEEDED by elogind +# conf.set10('ENABLE_TIMEDATECTL', get_option('timedated') or get_option('timesyncd')) +#endif // 0 + want_tests = get_option('tests') install_tests = get_option('install-tests') slow_tests = get_option('slow-tests') @@ -1444,7 +1412,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests) #if 0 /// UNNEEDED by elogind # if get_option('efi') # efi_arch = host_machine.cpu_family() -# +# # if efi_arch == 'x86' # EFI_MACHINE_TYPE_NAME = 'ia32' # gnu_efi_arch = 'ia32' @@ -1461,10 +1429,10 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests) # EFI_MACHINE_TYPE_NAME = '' # gnu_efi_arch = '' # endif -# +# # have = true # conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) -# +# # conf.set('SD_TPM_PCR', get_option('tpm-pcrindex').to_int()) # else # have = false @@ -1478,13 +1446,18 @@ config_h = configure_file( output : 'config.h', configuration : conf) +meson_apply_m4 = find_program('tools/meson-apply-m4.sh') + includes = include_directories('src/basic', 'src/shared', 'src/systemd', #if 0 /// UNNEEDED by elogind # 'src/journal', +# 'src/journal-remote', +# 'src/nspawn', # 'src/resolve', # 'src/timesync', +# 'src/time-wait-sync', #endif // 0 'src/login', #if 0 /// UNNEEDED by elogind @@ -1564,6 +1537,41 @@ libelogind = shared_library( install : true, install_dir : rootlibdir) +static_libelogind = get_option('static-libelogind') +static_libelogind_pic = static_libelogind == 'true' or static_libelogind == 'pic' + +install_libelogind_static = static_library( + 'elogind', + libelogind_sources, +#if 0 /// No journald with elogind (And before you ask: NO!) +# journal_client_sources, +#endif // 0 + basic_sources, +#if 0 /// No gcrypt with elogind +# basic_gcrypt_sources, +#endif // 0 + include_directories : includes, + build_by_default : static_libelogind != 'false', + install : static_libelogind != 'false', + install_dir : rootlibdir, + pic : static_libelogind == 'true' or static_libelogind == 'pic', + dependencies : [threads, + librt, + libxz, + liblz4, + libcap, + libblkid, +#if 0 /// libmount isn't built with elogind (and absolutely not needed anyway.) +# libmount, +#endif // 0 + libselinux, +#if 0 /// No grypt with elogind +# libgcrypt], +#else + ], +#endif // 0 + c_args : libelogind_c_args + (static_libelogind_pic ? [] : ['-fno-PIC'])) + ############################################################ # binaries that have --help and are intended for use by humans, @@ -1581,7 +1589,7 @@ subdir('src/shared') # subdir('src/core') # subdir('src/udev') # subdir('src/network') -# +# # subdir('src/analyze') # subdir('src/journal-remote') # subdir('src/coredump') @@ -1590,6 +1598,7 @@ subdir('src/shared') # subdir('src/kernel-install') # subdir('src/locale') # subdir('src/machine') +# subdir('src/portable') # subdir('src/nspawn') # subdir('src/resolve') # subdir('src/timedate') @@ -1621,14 +1630,14 @@ test_dlopen = executable( # ['systemd', 'ENABLE_NSS_SYSTEMD'], # ['mymachines', 'ENABLE_MACHINED'], # ['resolve', 'ENABLE_RESOLVE']] -# +# # condition = tuple[1] == '' or conf.get(tuple[1]) == 1 # if condition # module = tuple[0] -# +# # 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), @@ -1646,13 +1655,13 @@ test_dlopen = executable( # 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 @@ -1677,11 +1686,11 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # meson.add_install_script(meson_make_symlink, # join_paths(rootlibexecdir, 'systemd'), # join_paths(rootsbindir, 'init')) -# +# # exe = executable('systemd-analyze', # systemd_analyze_sources, # include_directories : includes, @@ -1696,7 +1705,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # executable('systemd-journald', # systemd_journald_sources, # include_directories : includes, @@ -1709,7 +1718,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('systemd-cat', # systemd_cat_sources, # include_directories : includes, @@ -1719,7 +1728,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('journalctl', # journalctl_sources, # include_directories : includes, @@ -1733,7 +1742,7 @@ test_dlopen = executable( # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # executable('systemd-getty-generator', # 'src/getty-generator/getty-generator.c', # include_directories : includes, @@ -1741,7 +1750,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # executable('systemd-debug-generator', # 'src/debug-generator/debug-generator.c', # include_directories : includes, @@ -1749,7 +1758,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # executable('systemd-fstab-generator', # 'src/fstab-generator/fstab-generator.c', # 'src/core/mount-setup.c', @@ -1758,7 +1767,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # if conf.get('ENABLE_ENVIRONMENT_D') == 1 # executable('30-systemd-environment-d-generator', # 'src/environment-d-generator/environment-d-generator.c', @@ -1767,12 +1776,12 @@ test_dlopen = executable( # 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')) # endif -# +# # if conf.get('ENABLE_HIBERNATE') == 1 # executable('systemd-hibernate-resume-generator', # 'src/hibernate-resume/hibernate-resume-generator.c', @@ -1781,7 +1790,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # executable('systemd-hibernate-resume', # 'src/hibernate-resume/hibernate-resume.c', # include_directories : includes, @@ -1790,7 +1799,7 @@ test_dlopen = executable( # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('HAVE_BLKID') == 1 # executable('systemd-gpt-auto-generator', # 'src/gpt-auto-generator/gpt-auto-generator.c', @@ -1801,7 +1810,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # exe = executable('systemd-dissect', # 'src/dissect/dissect.c', # include_directories : includes, @@ -1811,7 +1820,7 @@ test_dlopen = executable( # install_dir : rootlibexecdir) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_RESOLVE') == 1 # executable('systemd-resolved', # systemd_resolved_sources, @@ -1819,16 +1828,13 @@ test_dlopen = executable( # link_with : [libshared, # libbasic_gcrypt, # libsystemd_resolve_core], -# dependencies : [threads, -# libgpg_error, -# libm, -# libidn], +# dependencies : systemd_resolved_dependencies, # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# -# exe = executable('systemd-resolve', -# systemd_resolve_sources, +# +# exe = executable('resolvectl', +# resolvectl_sources, # include_directories : includes, # link_with : [libshared, # libbasic_gcrypt, @@ -1840,8 +1846,16 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] +# +# meson.add_install_script(meson_make_symlink, +# join_paths(bindir, 'resolvectl'), +# join_paths(rootsbindir, 'resolvconf')) +# +# meson.add_install_script(meson_make_symlink, +# join_paths(bindir, 'resolvectl'), +# join_paths(bindir, 'systemd-resolve')) # endif -# +# # if conf.get('ENABLE_LOGIND') == 1 # executable('systemd-logind', # systemd_logind_sources, @@ -1853,7 +1867,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('loginctl', # loginctl_sources, # include_directories : includes, @@ -1865,7 +1879,7 @@ test_dlopen = executable( # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # exe = executable('systemd-inhibit', # 'src/login/inhibit.c', # include_directories : includes, @@ -1874,7 +1888,7 @@ test_dlopen = executable( # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # if conf.get('HAVE_PAM') == 1 # version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym) # pam_systemd = shared_library( @@ -1892,12 +1906,21 @@ test_dlopen = executable( # 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 +# +# executable('systemd-user-runtime-dir', +# user_runtime_dir_sources, +# include_directories : includes, +# link_with : [libshared, liblogind_core], +# install_rpath : rootlibexecdir, +# install : true, +# install_dir : rootlibexecdir) +# #else executable('elogind', @@ -1965,7 +1988,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1 # exe = executable('bootctl', # 'src/boot/bootctl.c', @@ -1976,7 +1999,7 @@ endif # install : true) # public_programs += [exe] # endif -# +# # exe = executable('systemd-socket-activate', 'src/activate/activate.c', # include_directories : includes, # link_with : [libshared], @@ -1984,10 +2007,20 @@ endif # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# +# +# if get_option('link-systemctl-shared') +# systemctl_link_with = [libshared] +# else +# systemctl_link_with = [libsystemd_static, +# libshared_static, +# libjournal_client, +# libbasic_gcrypt] +# endif +# # exe = executable('systemctl', 'src/systemctl/systemctl.c', # include_directories : includes, -# link_with : [libshared], +# link_with : systemctl_link_with, # dependencies : [threads, # libcap, # libselinux, @@ -1997,13 +2030,33 @@ endif # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# +# if conf.get('ENABLE_PORTABLED') == 1 +# executable('systemd-portabled', +# systemd_portabled_sources, +# include_directories : includes, +# link_with : [libshared], +# dependencies : [threads], +# install_rpath : rootlibexecdir, +# install : true, +# install_dir : rootlibexecdir) +# +# exe = executable('portablectl', 'src/portable/portablectl.c', +# include_directories : includes, +# link_with : [libshared], +# dependencies : [threads], +# install_rpath : rootlibexecdir, +# install : true, +# install_dir : rootlibexecdir) +# public_programs += [exe] +# endif +# # foreach alias : ['halt', 'poweroff', 'reboot', 'runlevel', 'shutdown', 'telinit'] # meson.add_install_script(meson_make_symlink, # join_paths(rootbindir, 'systemctl'), # join_paths(rootsbindir, alias)) # endforeach -# +# # if conf.get('ENABLE_BACKLIGHT') == 1 # executable('systemd-backlight', # 'src/backlight/backlight.c', @@ -2013,7 +2066,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('ENABLE_RFKILL') == 1 # executable('systemd-rfkill', # 'src/rfkill/rfkill.c', @@ -2023,7 +2076,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # executable('systemd-system-update-generator', # 'src/system-update-generator/system-update-generator.c', # include_directories : includes, @@ -2031,7 +2084,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # if conf.get('HAVE_LIBCRYPTSETUP') == 1 # executable('systemd-cryptsetup', # 'src/cryptsetup/cryptsetup.c', @@ -2041,7 +2094,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-cryptsetup-generator', # 'src/cryptsetup/cryptsetup-generator.c', # include_directories : includes, @@ -2050,7 +2103,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # executable('systemd-veritysetup', # 'src/veritysetup/veritysetup.c', # include_directories : includes, @@ -2059,7 +2112,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-veritysetup-generator', # 'src/veritysetup/veritysetup-generator.c', # include_directories : includes, @@ -2069,7 +2122,7 @@ endif # install : true, # install_dir : systemgeneratordir) # endif -# +# # if conf.get('HAVE_SYSV_COMPAT') == 1 # executable('systemd-sysv-generator', # 'src/sysv-generator/sysv-generator.c', @@ -2078,7 +2131,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # executable('systemd-rc-local-generator', # 'src/rc-local-generator/rc-local-generator.c', # include_directories : includes, @@ -2087,7 +2140,7 @@ endif # install : true, # install_dir : systemgeneratordir) # endif -# +# # if conf.get('ENABLE_HOSTNAMED') == 1 # executable('systemd-hostnamed', # 'src/hostname/hostnamed.c', @@ -2096,7 +2149,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('hostnamectl', # 'src/hostname/hostnamectl.c', # include_directories : includes, @@ -2105,7 +2158,7 @@ endif # install : true) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_LOCALED') == 1 # if conf.get('HAVE_XKBCOMMON') == 1 # # logind will load libxkbcommon.so dynamically on its own @@ -2113,7 +2166,7 @@ endif # else # deps = [] # endif -# +# # executable('systemd-localed', # systemd_localed_sources, # include_directories : includes, @@ -2122,7 +2175,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('localectl', # localectl_sources, # include_directories : includes, @@ -2131,7 +2184,7 @@ endif # install : true) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_TIMEDATED') == 1 # executable('systemd-timedated', # 'src/timedate/timedated.c', @@ -2140,16 +2193,19 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# endif +# +# if conf.get('ENABLE_TIMEDATECTL') == 1 # exe = executable('timedatectl', # 'src/timedate/timedatectl.c', # include_directories : includes, # install_rpath : rootlibexecdir, # link_with : [libshared], +# dependencies : [libm], # install : true) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_TIMESYNCD') == 1 # executable('systemd-timesyncd', # systemd_timesyncd_sources, @@ -2160,8 +2216,16 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) +# +# executable('systemd-time-wait-sync', +# 'src/time-wait-sync/time-wait-sync.c', +# include_directories : includes, +# link_with : [libshared], +# install_rpath : rootlibexecdir, +# install : true, +# install_dir : rootlibexecdir) # endif -# +# # if conf.get('ENABLE_MACHINED') == 1 # executable('systemd-machined', # systemd_machined_sources, @@ -2171,7 +2235,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('machinectl', # 'src/machine/machinectl.c', # include_directories : includes, @@ -2184,7 +2248,7 @@ endif # install_dir : rootbindir) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_IMPORTD') == 1 # executable('systemd-importd', # systemd_importd_sources, @@ -2194,7 +2258,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # systemd_pull = executable('systemd-pull', # systemd_pull_sources, # include_directories : includes, @@ -2207,7 +2271,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # systemd_import = executable('systemd-import', # systemd_import_sources, # include_directories : includes, @@ -2219,7 +2283,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # systemd_export = executable('systemd-export', # systemd_export_sources, # include_directories : includes, @@ -2233,7 +2297,7 @@ endif # install_dir : rootlibexecdir) # public_programs += [systemd_pull, systemd_import, systemd_export] # endif -# +# # if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 # exe = executable('systemd-journal-upload', # systemd_journal_upload_sources, @@ -2249,12 +2313,13 @@ endif # install_dir : rootlibexecdir) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 # s_j_remote = executable('systemd-journal-remote', # systemd_journal_remote_sources, # include_directories : includes, -# link_with : [libshared], +# link_with : [libshared, +# libsystemd_journal_remote], # dependencies : [threads, # libmicrohttpd, # libgnutls, @@ -2263,7 +2328,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # s_j_gatewayd = executable('systemd-journal-gatewayd', # systemd_journal_gatewayd_sources, # include_directories : includes, @@ -2278,7 +2343,7 @@ endif # install_dir : rootlibexecdir) # public_programs += [s_j_remote, s_j_gatewayd] # endif -# +# # if conf.get('ENABLE_COREDUMP') == 1 # executable('systemd-coredump', # systemd_coredump_sources, @@ -2292,7 +2357,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('coredumpctl', # coredumpctl_sources, # include_directories : includes, @@ -2304,7 +2369,7 @@ endif # install : true) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_BINFMT') == 1 # exe = executable('systemd-binfmt', # 'src/binfmt/binfmt.c', @@ -2314,13 +2379,13 @@ endif # 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') == 1 # executable('systemd-vconsole-setup', # 'src/vconsole/vconsole-setup.c', @@ -2330,7 +2395,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('ENABLE_RANDOMSEED') == 1 # executable('systemd-random-seed', # 'src/random-seed/random-seed.c', @@ -2340,7 +2405,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('ENABLE_FIRSTBOOT') == 1 # executable('systemd-firstboot', # 'src/firstboot/firstboot.c', @@ -2351,7 +2416,7 @@ endif # install : true, # install_dir : rootbindir) # endif -# +# # executable('systemd-remount-fs', # 'src/remount-fs/remount-fs.c', # 'src/core/mount-setup.c', @@ -2361,7 +2426,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-machine-id-setup', # 'src/machine-id-setup/machine-id-setup-main.c', # 'src/core/machine-id-setup.c', @@ -2371,7 +2436,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootbindir) -# +# # executable('systemd-fsck', # 'src/fsck/fsck.c', # include_directories : includes, @@ -2379,7 +2444,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('elogind-growfs', # 'src/partition/growfs.c', # include_directories : includes, @@ -2388,7 +2453,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('elogind-makefs', # 'src/partition/makefs.c', # include_directories : includes, @@ -2396,7 +2461,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-sleep', # 'src/sleep/sleep.c', # include_directories : includes, @@ -2404,7 +2469,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('systemd-sysctl', # 'src/sysctl/sysctl.c', # include_directories : includes, @@ -2413,7 +2478,7 @@ endif # install : true, # install_dir : rootlibexecdir) # public_programs += [exe] -# +# # executable('systemd-ac-power', # 'src/ac-power/ac-power.c', # include_directories : includes, @@ -2421,7 +2486,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('systemd-detect-virt', # 'src/detect-virt/detect-virt.c', # include_directories : includes, @@ -2429,7 +2494,7 @@ endif # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('systemd-delta', # 'src/delta/delta.c', # include_directories : includes, @@ -2437,7 +2502,7 @@ endif # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('systemd-escape', # 'src/escape/escape.c', # include_directories : includes, @@ -2446,7 +2511,7 @@ endif # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # exe = executable('systemd-notify', # 'src/notify/notify.c', # include_directories : includes, @@ -2455,7 +2520,7 @@ endif # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # executable('systemd-volatile-root', # 'src/volatile-root/volatile-root.c', # include_directories : includes, @@ -2463,7 +2528,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-cgroups-agent', # 'src/cgroups-agent/cgroups-agent.c', # include_directories : includes, @@ -2489,7 +2554,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('systemd-ask-password', # 'src/ask-password/ask-password.c', # include_directories : includes, @@ -2498,7 +2563,7 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # executable('systemd-reply-password', # 'src/reply-password/reply-password.c', # include_directories : includes, @@ -2506,7 +2571,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('systemd-tty-ask-password-agent', # 'src/tty-ask-password-agent/tty-ask-password-agent.c', # include_directories : includes, @@ -2515,7 +2580,7 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # exe = executable('systemd-cgls', # 'src/cgls/cgls.c', # include_directories : includes, @@ -2523,7 +2588,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('systemd-cgtop', # 'src/cgtop/cgtop.c', # include_directories : includes, @@ -2531,7 +2596,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # executable('systemd-initctl', # 'src/initctl/initctl.c', # include_directories : includes, @@ -2539,7 +2604,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('systemd-mount', # 'src/mount/mount-tool.c', # include_directories : includes, @@ -2547,10 +2612,10 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # meson.add_install_script(meson_make_symlink, # 'systemd-mount', join_paths(bindir, 'systemd-umount')) -# +# # exe = executable('systemd-run', # 'src/run/run.c', # include_directories : includes, @@ -2558,7 +2623,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('systemd-stdio-bridge', # 'src/stdio-bridge/stdio-bridge.c', # include_directories : includes, @@ -2566,7 +2631,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('busctl', # 'src/busctl/busctl.c', # 'src/busctl/busctl-introspect.c', @@ -2576,7 +2641,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # if conf.get('ENABLE_SYSUSERS') == 1 # exe = executable('systemd-sysusers', # 'src/sysusers/sysusers.c', @@ -2587,7 +2652,7 @@ executable('elogind-cgroups-agent', # install_dir : rootbindir) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_TMPFILES') == 1 # exe = executable('systemd-tmpfiles', # 'src/tmpfiles/tmpfiles.c', @@ -2598,13 +2663,13 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # test('test-systemd-tmpfiles', # test_systemd_tmpfiles_py, # args : exe.full_path()) # # https://github.com/mesonbuild/meson/issues/2681 # endif -# +# # if conf.get('ENABLE_HWDB') == 1 # exe = executable('systemd-hwdb', # 'src/hwdb/hwdb.c', @@ -2616,7 +2681,7 @@ executable('elogind-cgroups-agent', # install_dir : rootbindir) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_QUOTACHECK') == 1 # executable('systemd-quotacheck', # 'src/quotacheck/quotacheck.c', @@ -2626,7 +2691,7 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootlibexecdir) # endif -# +# # exe = executable('systemd-socket-proxyd', # 'src/socket-proxy/socket-proxyd.c', # include_directories : includes, @@ -2636,7 +2701,7 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootlibexecdir) # public_programs += [exe] -# +# # exe = executable('systemd-udevd', # systemd_udevd_sources, # include_directories : includes, @@ -2653,7 +2718,7 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootlibexecdir) # public_programs += [exe] -# +# # exe = executable('udevadm', # udevadm_sources, # c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], @@ -2670,15 +2735,16 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # executable('systemd-shutdown', # systemd_shutdown_sources, # include_directories : includes, # link_with : [libshared], +# dependencies : [libmount], # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-update-done', # 'src/update-done/update-done.c', # include_directories : includes, @@ -2686,7 +2752,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-update-utmp', # 'src/update-utmp/update-utmp.c', # include_directories : includes, @@ -2695,7 +2761,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # if conf.get('HAVE_KMOD') == 1 # executable('systemd-modules-load', # 'src/modules-load/modules-load.c', @@ -2705,29 +2771,27 @@ executable('elogind-cgroups-agent', # 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'))) # endif -# +# # exe = executable('systemd-nspawn', # systemd_nspawn_sources, # 'src/core/mount-setup.c', # FIXME: use a variable? # 'src/core/mount-setup.h', # 'src/core/loopback-setup.c', # 'src/core/loopback-setup.h', -# include_directories : [includes, include_directories('src/nspawn')], -# link_with : [libshared], -# dependencies : [libacl, -# libblkid, -# libseccomp, -# libselinux], +# include_directories : includes, +# link_with : [libnspawn_core, +# libshared], +# dependencies : [libblkid], # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # if conf.get('ENABLE_NETWORKD') == 1 # executable('systemd-networkd', # systemd_networkd_sources, @@ -2740,7 +2804,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-networkd-wait-online', # systemd_networkd_wait_online_sources, # include_directories : includes, @@ -2749,7 +2813,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('networkctl', # networkctl_sources, # include_directories : includes, @@ -2760,7 +2824,7 @@ executable('elogind-cgroups-agent', # install_dir : rootbindir) # public_programs += [exe] # endif -# +# # executable('systemd-sulogin-shell', # ['src/sulogin-shell/sulogin-shell.c'], # include_directories : includes, @@ -2827,17 +2891,30 @@ foreach tuple : tests endforeach #if 0 /// UNNEEDED by elogind -# test_libsystemd_sym = executable( +# exe = executable( # '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('test-libsystemd-sym', exe) +# +# exe = executable( +# 'test-libsystemd-static-sym', +# test_libsystemd_sym_c, +# include_directories : includes, +# link_with : [install_libsystemd_static], +# dependencies : [threads], # threads is already included in dependencies on the library, +# # but does not seem to get propagated. Add here as a work-around. +# build_by_default : static_libsystemd_pic, +# install : install_tests and static_libsystemd_pic, +# install_dir : testsdir) +# if static_libsystemd_pic +# test('test-libsystemd-static-sym', exe) +# endif +# +# exe = executable( # 'test-libudev-sym', # test_libudev_sym_c, # include_directories : includes, @@ -2845,28 +2922,40 @@ endforeach # link_with : [libudev], # install : install_tests, # install_dir : testsdir) -# test('test-libudev-sym', -# test_libudev_sym) -# +# test('test-libudev-sym', exe) +# +# exe = executable( +# 'test-libudev-static-sym', +# test_libudev_sym_c, +# include_directories : includes, +# c_args : ['-Wno-deprecated-declarations'], +# link_with : [install_libudev_static], +# build_by_default : static_libudev_pic, +# install : install_tests and static_libudev_pic, +# install_dir : testsdir) +# if static_libudev_pic +# test('test-libudev-static-sym', exe) +# endif +# # ############################################################ -# +# # fuzzer_exes = [] -# +# # foreach tuple : fuzzers # sources = tuple[0] # link_with = tuple[1].length() > 0 ? tuple[1] : [libshared] # dependencies = tuple[2] # defs = tuple.length() >= 4 ? tuple[3] : [] # incs = tuple.length() >= 5 ? tuple[4] : includes -# +# # if fuzzer_build # dependencies += fuzzing_engine # else # sources += 'src/fuzz/fuzz-main.c' # endif -# +# # name = sources[0].split('/')[-1].split('.')[0] -# +# # fuzzer_exes += executable( # name, # sources, @@ -2876,13 +2965,13 @@ endforeach # c_args : defs, # install : false) # endforeach -# +# # run_target('fuzzers', # depends : fuzzer_exes, # command : ['true']) -# +# # ############################################################ -# +# #else test_libelogind_sym = executable( 'test-libelogind-sym', @@ -2899,7 +2988,7 @@ make_man_index_py = find_program('tools/make-man-index.py') xml_helper_py = find_program('tools/xml_helper.py') #if 0 /// UNNEEDED by elogind # hwdb_update_sh = find_program('tools/meson-hwdb-update.sh') -# +# # subdir('units') # subdir('sysctl.d') # subdir('sysusers.d') @@ -2912,8 +3001,8 @@ subdir('man') subdir('shell-completion/bash') subdir('shell-completion/zsh') #if 0 /// UNNEEDED by elogind -# subdir('docs/sysvinit') -# subdir('docs/var-log') +# subdir('doc/sysvinit') +# subdir('doc/var-log') #endif // 0 # FIXME: figure out if the warning is true: @@ -2963,49 +3052,57 @@ endforeach ############################################################ #if 0 /// fuzz regression tests are not supported by elogind -# prev = '' -# foreach p : fuzz_regression_tests -# a = p.split('/')[-3] -# b = p.split('/')[-2] -# c = p.split('/')[-1] -# -# if a == 'address' -# build = sanitize_address -# else -# error('unknown sanitizer @0@'.format(a)) -# endif -# -# name = '@1@:@0@'.format(a, b) -# -# if name != prev -# if want_tests == 'false' -# message('Not compiling @0@ because tests is set to false'.format(name)) -# elif not sanitizers.contains(a) -# message('Not compiling @0@ because @1@ sanitizer is not available'.format(name, a)) -# elif slow_tests -# exe = custom_target( -# name, -# output : name, -# depends : build, -# command : [env, 'ln', '-fs', -# join_paths(build.full_path(), b), -# '@OUTPUT@'], -# build_by_default : true) -# else -# message('Not compiling @0@ because slow-tests is set to false'.format(name)) -# endif -# endif -# prev = name -# -# if want_tests != 'false' and slow_tests -# test(c, env, args : [exe.full_path(), -# join_paths(meson.source_root(), -# 'test/fuzz-regressions', -# p)]) +# # Enable tests for all supported sanitizers +# foreach tuple : sanitizers +# sanitizer = tuple[0] +# build = tuple[1] +# +# have = run_command(check_compilation_sh, +# cc.cmd_array(), '-x', 'c', +# '-fsanitize=@0@'.format(sanitizer), +# '-include', link_test_c).returncode() == 0 +# message('@0@ sanitizer supported: @1@'.format(sanitizer, have ? 'yes' : 'no')) +# +# if have +# prev = '' +# foreach p : fuzz_regression_tests +# b = p.split('/')[-2] +# c = p.split('/')[-1] +# +# name = '@0@:@1@'.format(b, sanitizer) +# +# if name != prev +# if want_tests == 'false' +# message('Not compiling @0@ because tests is set to false'.format(name)) +# elif slow_tests +# exe = custom_target( +# name, +# output : name, +# depends : build, +# command : [env, 'ln', '-fs', +# join_paths(build.full_path(), b), +# '@OUTPUT@'], +# build_by_default : true) +# else +# message('Not compiling @0@ because slow-tests is set to false'.format(name)) +# endif +# endif +# prev = name +# +# if want_tests != 'false' and slow_tests +# test('@0@:@1@:@2@'.format(b, c, sanitizer), +# env, +# args : [exe.full_path(), +# join_paths(meson.source_root(), +# 'test/fuzz-regressions', +# p)]) +# endif +# endforeach # endif # endforeach #endif // 0 + ############################################################ if git.found() @@ -3020,9 +3117,8 @@ if git.found() 'tags', output : 'tags', command : [env, 'etags', '-o', '@0@/TAGS'.format(meson.current_source_dir())] + all_files) - custom_target( + run_target( 'ctags', - output : 'ctags', command : [env, 'ctags', '-o', '@0@/tags'.format(meson.current_source_dir())] + all_files) endif @@ -3120,8 +3216,9 @@ status = [ # 'nobody group name: @0@'.format(nobody_group), # 'fallback hostname: @0@'.format(get_option('fallback-hostname')), # 'symbolic gateway hostnames: @0@'.format(', '.join(gateway_hostnames)), -# +# # 'default DNSSEC mode: @0@'.format(default_dnssec), +# 'default DNS-over-TLS mode: @0@'.format(default_dns_over_tls), # 'default cgroup hierarchy: @0@'.format(default_hierarchy), #endif // 0 'default KillUserProcesses setting: @0@'.format(kill_user_processes)] @@ -3132,7 +3229,7 @@ status = [ # status += [ # 'default DNS servers: @0@'.format(alt_dns_servers), # 'default NTP servers: @0@'.format(alt_ntp_servers)] -# +# # alt_time_epoch = run_command('date', '-Is', '-u', '-d', # '@@0@'.format(time_epoch)).stdout().strip() # status += [ @@ -3148,7 +3245,7 @@ status = [ # if conf.get('ENABLE_EFI') == 1 # status += [ # 'efi arch: @0@'.format(efi_arch)] -# +# # if have_gnu_efi # status += [ # 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), @@ -3209,6 +3306,7 @@ foreach tuple : [ # ['rfkill'], # ['logind'], # ['machined'], +# ['portabled'], # ['importd'], # ['hostnamed'], # ['timedated'], @@ -3216,6 +3314,7 @@ foreach tuple : [ # ['localed'], # ['networkd'], # ['resolve'], +# ['DNS-over-TLS'], # ['coredump'], #endif // 0 ['polkit'], @@ -3248,9 +3347,11 @@ foreach tuple : [ # ['adm group', get_option('adm-group')], # ['wheel group', get_option('wheel-group')], # ['gshadow'], -#else - ['debug elogind'], #endif // 0 + ['valgrind', conf.get('VALGRIND') == 1], +#if 1 /// Extra debugging for elogind + ['debug elogind'], +#endif // 1 ['debug hashmap'], ['debug mmap cache'], ] @@ -3277,9 +3378,11 @@ status += [ ''] message('\n '.join(status)) -if rootprefixdir != rootprefix_default - message('WARNING:\n' + - ' Note that the installation prefix was changed to "@0@".\n'.format(rootprefixdir) + - ' elogind used fixed names for unit file directories and other paths, so anything\n' + - ' except the default ("@0@") is strongly discouraged.'.format(rootprefix_default)) -endif +#if 0 /// Nicely enough this isn't true for elogind. :-) +# if rootprefixdir != rootprefix_default +# warning('\n' + +# 'Note that the installation prefix was changed to "@0@".\n'.format(rootprefixdir) + +# 'systemd used fixed names for unit file directories and other paths, so anything\n' + +# 'except the default ("@0@") is strongly discouraged.'.format(rootprefix_default)) +# endif +#endif // 0