system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

meson: Remove unused variables

Browse source
This commit is contained in:
Jan Janssen 2023-01-27 14:28:15 +01:00
parent c8943ce884
commit 6249face77
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
meson.build
View file

@ -184,7 +184,6 @@ sysctldir = prefixdir / 'lib/sysctl.d'
binfmtdir = prefixdir / 'lib/binfmt.d'
modulesloaddir = prefixdir / 'lib/modules-load.d'
networkdir = rootprefixdir / 'lib/systemd/network'
pkgincludedir = includedir / 'systemd'
systemgeneratordir = rootlibexecdir / 'system-generators'
usergeneratordir = prefixdir / 'lib/systemd/user-generators'
systemenvgeneratordir = prefixdir / 'lib/systemd/system-environment-generators'
@ -316,7 +315,6 @@ conf.set10('FIRST_BOOT_FULL_PRESET', get_option('first-
#####################################################################
cc = meson.get_compiler('c')
pkgconfig = import('pkgconfig')
meson_build_sh = find_program('tools/meson-build.sh')
want_tests = get_option('tests')
@ -1090,12 +1088,9 @@ else
if clang_found
clang = r.path()
endif
# Assume that the required flags are supported by the found clang.
clang_supports_flags = clang_found
else
clang_found = true
clang = cc.cmd_array()
clang_supports_flags = cc.has_argument('-Wno-compare-distinct-pointer-types')
endif
if clang_found
@ -2105,7 +2100,7 @@ install_libudev_static = static_library(
if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1
if conf.get('HAVE_TPM2') == 1
cryptsetup_token_systemd_tpm2 = shared_library(
shared_library(
'cryptsetup-token-systemd-tpm2',
cryptsetup_token_systemd_tpm2_sources,
include_directories : includes,
@ -2123,7 +2118,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1
endif
if conf.get('HAVE_LIBFIDO2') == 1
cryptsetup_token_systemd_fido2 = shared_library(
shared_library(
'cryptsetup-token-systemd-fido2',
cryptsetup_token_systemd_fido2_sources,
include_directories : includes,
@ -2141,7 +2136,7 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1
endif
if conf.get('HAVE_P11KIT') == 1
cryptsetup_token_systemd_pkcs11 = shared_library(
shared_library(
'cryptsetup-token-systemd-pkcs11',
cryptsetup_token_systemd_pkcs11_sources,
include_directories : includes,

2
src/test/meson.build
View file

@ -9,8 +9,6 @@ test_hashmap_ordered_c = custom_target(
capture : true,
build_by_default : want_tests != 'false')
test_include_dir = include_directories('.')
path = run_command(sh, '-c', 'echo "$PATH"', check: true).stdout().strip()
test_env = environment()
test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map)