X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=meson.build;h=56c98b9c1b7bff4abb77f9fb51df62375d2aa192;hb=51c682df38fa032599c6c0e4556136c7d6d7c504;hp=1f44c0fe70d327f4e84d902cff359e815a203eef;hpb=ee589a1882d1bbf9f0681677712421aef534dd00;p=thirdparty%2Fsystemd.git diff --git a/meson.build b/meson.build index 1f44c0fe70d..56c98b9c1b7 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1+ project('systemd', 'c', - version : '239', + version : '241', license : 'LGPLv2+', default_options: [ 'c_std=gnu99', @@ -12,20 +12,19 @@ project('systemd', 'c', meson_version : '>= 0.46', ) -libsystemd_version = '0.23.0' -libudev_version = '1.6.11' +libsystemd_version = '0.25.0' +libudev_version = '1.6.13' # 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! conf = configuration_data() -conf.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version()) -conf.set_quoted('PACKAGE_VERSION', meson.project_version()) +conf.set('PROJECT_VERSION', meson.project_version()) substs = configuration_data() -substs.set('PACKAGE_URL', 'https://www.freedesktop.org/wiki/Software/systemd') -substs.set('PACKAGE_VERSION', meson.project_version()) +substs.set('PROJECT_URL', 'https://www.freedesktop.org/wiki/Software/systemd') +substs.set('PROJECT_VERSION', meson.project_version()) want_ossfuzz = get_option('oss-fuzz') want_libfuzzer = get_option('llvm-fuzz') @@ -287,10 +286,8 @@ want_tests = get_option('tests') slow_tests = want_tests != 'false' and get_option('slow-tests') install_tests = get_option('install-tests') -cxx = find_program('c++', required : fuzzer_build) -if cxx.found() +if add_languages('cpp', required : fuzzer_build) # Used only for tests - add_languages('cpp') cxx_cmd = ' '.join(meson.get_compiler('cpp').cmd_array()) else cxx_cmd = '' @@ -362,13 +359,6 @@ possible_link_flags = [ '-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 - possible_cc_flags += '-fPIE' - possible_link_flags += '-pie' -endif - if cc.get_id() == 'clang' possible_cc_flags += [ '-Wno-typedef-redefinition', @@ -486,6 +476,7 @@ foreach decl : [['ETHTOOL_LINK_MODE_10baseT_Half_BIT', 'linux/ethtool.h'], ['IFLA_TARGET_NETNSID', 'linux/if_link.h'], ['IFLA_NEW_IFINDEX', 'linux/if_link.h'], ['IFLA_MAX_MTU', 'linux/if_link.h'], + ['IFLA_BOND_MODE', 'linux/if_link.h'], ['IFLA_BOND_ACTIVE_SLAVE', 'linux/if_link.h'], ['IFLA_BOND_AD_INFO', 'linux/if_link.h'], ['IFLA_BOND_AD_ACTOR_SYSTEM', 'linux/if_link.h'], @@ -584,6 +575,18 @@ endif ##################################################################### +vcs_tagger = [meson.source_root() + '/tools/meson-vcs-tag.sh', + meson.source_root(), + get_option('version-tag'), + meson.project_version()] + +version_h = vcs_tag( + input : 'src/version/version.h.in', + output : 'version.h', + command: vcs_tagger) + +versiondep = declare_dependency(sources: version_h) + sed = find_program('sed') awk = find_program('awk') m4 = find_program('m4') @@ -694,6 +697,9 @@ else conf.set('DEFAULT_HIERARCHY', 'CGROUP_UNIFIED_ALL') endif +default_net_naming_scheme = get_option('default-net-naming-scheme') +conf.set_quoted('DEFAULT_NET_NAMING_SCHEME', default_net_naming_scheme) + time_epoch = get_option('time-epoch') if time_epoch == -1 NEWS = files('NEWS') @@ -827,6 +833,17 @@ ntp_servers = get_option('ntp-servers') conf.set_quoted('NTP_SERVERS', ntp_servers) substs.set('NTP_SERVERS', ntp_servers) +default_locale = get_option('default-locale') +if default_locale == '' + if not meson.is_cross_build() + choose_default_locale_sh = find_program('tools/choose-default-locale.sh') + default_locale = run_command(choose_default_locale_sh).stdout().strip() + else + default_locale = 'C.UTF-8' + endif +endif +conf.set_quoted('SYSTEMD_DEFAULT_LOCALE', default_locale) + conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) substs.set('SUSHELL', get_option('debug-shell')) @@ -1434,6 +1451,7 @@ includes = include_directories('src/basic', 'src/libsystemd/sd-id128', 'src/libsystemd/sd-netlink', 'src/libsystemd/sd-network', + 'src/libsystemd/sd-resolve', 'src/libsystemd-network', '.') @@ -2383,6 +2401,9 @@ executable('systemd-sleep', install : true, install_dir : rootlibexecdir) +install_data('src/sleep/sleep.conf', + install_dir : pkgsysconfdir) + exe = executable('systemd-sysctl', 'src/sysctl/sysctl.c', include_directories : includes, @@ -3041,10 +3062,6 @@ run_target( depends : [man, libsystemd, libudev], command : [meson_check_api_docs_sh, libsystemd.full_path(), libudev.full_path()]) -run_target( - 'make-index-md', - command : ['sh', '@0@/tools/make-index-md.sh'.format(meson.source_root()), meson.source_root()]) - ############################################################ status = [ @@ -3093,7 +3110,9 @@ status = [ '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), - 'default KillUserProcesses setting: @0@'.format(kill_user_processes)] + 'default net.naming-scheme setting: @0@'.format(default_net_naming_scheme), + 'default KillUserProcesses setting: @0@'.format(kill_user_processes), + 'default locale: @0@'.format(default_locale)] alt_dns_servers = '\n '.join(dns_servers.split(' ')) alt_ntp_servers = '\n '.join(ntp_servers.split(' ')) @@ -3121,7 +3140,7 @@ if conf.get('ENABLE_EFI') == 1 if have_gnu_efi status += [ 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), - 'EFI CC @0@'.format(efi_cc), + 'EFI CC @0@'.format(' '.join(efi_cc)), 'EFI lib directory: @0@'.format(efi_libdir), 'EFI lds directory: @0@'.format(efi_ldsdir), 'EFI include directory: @0@'.format(efi_incdir)]