dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26728 from keszybz/meson-update

Browse Source 
Meson version update
This commit is contained in:
Lennart Poettering
2023-06-13 23:38:41 +02:00
committed by GitHub
parent 3f2ff79763 80dc9ad98c
commit 5bc4570fd4
3 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
meson.build
View File

@@ -10,7 +10,7 @@ project('systemd', 'c',
'localstatedir=/var',
'warning_level=2',
],
meson_version : '>= 0.53.2',
meson_version : '>= 0.56.0',
)
libsystemd_version = '0.36.0'
@@ -330,7 +330,7 @@ slow_tests = want_tests != 'false' and get_option('slow-tests')
fuzz_tests = want_tests != 'false' and get_option('fuzz-tests')
install_tests = get_option('install-tests')
if add_languages('cpp', required : fuzzer_build)
if add_languages('cpp', native : false, required : fuzzer_build)
# Used only for tests
cxx = meson.get_compiler('cpp')
cxx_cmd = ' '.join(cxx.cmd_array())
@@ -527,7 +527,7 @@ has_wstringop_truncation = cc.has_argument('-Wstringop-truncation')
#####################################################################
# compilation result tests
conf.set('_GNU_SOURCE', true)
conf.set('_GNU_SOURCE', 1)
conf.set('__SANE_USERSPACE_TYPES__', true)
conf.set10('HAVE_WSTRINGOP_TRUNCATION', has_wstringop_truncation)
@@ -735,7 +735,7 @@ foreach prog : progs
'/usr/sbin/' + prog[0],
'/sbin/' + prog[0],
required: false)
path = exe.found() ? exe.path() : prog[1]
path = exe.found() ? exe.full_path() : prog[1]
endif
name = prog.length() > 2 ? prog[2] : prog[0].to_upper()
conf.set_quoted(name, path)
@@ -1123,7 +1123,7 @@ else
r = find_program('clang', required : bpf_framework_required, version : '>= 10.0.0')
clang_found = r.found()
if clang_found
clang = r.path()
clang = r.full_path()
endif
else
clang_found = true
@@ -4454,8 +4454,8 @@ foreach test : tests
versiondep,
]
# FIXME: Use fs.stem() with meson >= 0.54.0
name = '@0@'.format(sources[0]).split('/')[-1]
# FIXME: Drop .format with meson >= 0.59.0
name = fs.stem('@0@'.format(sources[0]))
if not name.endswith('.cc')
deps += [userspace]
endif
@@ -4594,8 +4594,8 @@ foreach fuzzer : fuzzers
endif
sources += fuzz_generated_directives
# FIXME: Use fs.stem() with meson >= 0.54.0
name = '@0@'.format(sources[0]).split('/')[-1].split('.')[0]
# FIXME: Drop .format with meson >= 0.59.0
name = fs.stem('@0@'.format(sources[0]))
exe = executable(
name,

2
shell-completion/bash/meson.build
View File

@@ -4,7 +4,7 @@ bashcompletiondir = get_option('bashcompletiondir')
if bashcompletiondir == ''
bash_completion = dependency('bash-completion', required : false)
if bash_completion.found()
bashcompletiondir = bash_completion.get_pkgconfig_variable('completionsdir')
bashcompletiondir = bash_completion.get_variable(pkgconfig : 'completionsdir')
else
bashcompletiondir = datadir / 'bash-completion/completions'
endif

41
src/test/meson.build
View File

@@ -200,16 +200,12 @@ tests += [
'condition' : 'HAVE_ACL',
},
{
'sources' : [
files('test-af-list.c'),
generated_gperf_headers,
],
'sources' : files('test-af-list.c') +
generated_gperf_headers,
},
{
'sources' : [
files('test-arphrd-util.c'),
generated_gperf_headers,
],
'sources' : files('test-arphrd-util.c') +
generated_gperf_headers,
},
{
'sources' : files('test-ask-password-api.c'),
@@ -228,10 +224,8 @@ tests += [
'type' : 'manual',
},
{
'sources' : [
files('test-cap-list.c'),
generated_gperf_headers,
],
'sources' : files('test-cap-list.c') +
generated_gperf_headers,
'dependencies' : libcap,
},
{
@@ -268,28 +262,25 @@ tests += [
'dependencies' : libp11kit_cflags
},
{
'sources' : [
files('test-errno-list.c'),
generated_gperf_headers,
],
'sources' : files('test-errno-list.c') +
generated_gperf_headers,
},
{
'sources' : files('test-fd-util.c'),
'dependencies' : libseccomp,
},
{
'sources' : [files(
'test-hashmap.c',
'test-hashmap-plain.c'),
test_hashmap_ordered_c,
],
'sources' : files(
'test-hashmap.c',
'test-hashmap-plain.c',
) + [
test_hashmap_ordered_c,
],
'timeout' : 180,
},
{
'sources' : [
files('test-ip-protocol-list.c'),
shared_generated_gperf_headers,
],
'sources' : files('test-ip-protocol-list.c') +
shared_generated_gperf_headers,
},
{
'sources' : files('test-ipcrm.c'),