picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8412 from keszybz/meson-warning-fixes 

Meson warning fixes
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-03-09 20:12:37 +01:00 committed by GitHub
parent aa8f97bdad c0b4b0f8f5
commit 6fed2cc41f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -844,8 +844,7 @@ if not libcap.found()
endif
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
@ -2904,8 +2903,9 @@ foreach tuple : [
['debug mmap cache'],
]
cond = tuple.get(1, '')
if cond == ''
if tuple.length() >= 2
cond = tuple[1]
else
ident1 = 'HAVE_' + tuple[0].underscorify().to_upper()
ident2 = 'ENABLE_' + tuple[0].underscorify().to_upper()
cond = conf.get(ident1, 0) == 1 or conf.get(ident2, 0) == 1

4
src/journal-remote/meson.build
View File

@ -61,6 +61,6 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
meson.add_install_script('sh', '-c',
mkdir_p.format('/var/log/journal/remote'))
meson.add_install_script('sh', '-c',
'chown 0:0 $DESTDIR/var/log/journal/remote &&
chmod 755 $DESTDIR/var/log/journal/remote || :')
'''chown 0:0 $DESTDIR/var/log/journal/remote &&
chmod 755 $DESTDIR/var/log/journal/remote || :''')
endif