meson: enable oomd by default in developer mode

We want to compile the new code in CI without having to explicitly specify
-Doomd=true everywhere. Let's enable it by default, and rely on distros
setting -Dmode=release to not have it enabled by default.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-10-15 15:53:57 +02:00
parent 69c0807432
commit d58c5f0fe7
2 changed files with 10 additions and 2 deletions

View File

@ -1412,7 +1412,15 @@ conf.set10('ENABLE_HOMED', have)
have = have and conf.get('HAVE_PAM') == 1
conf.set10('ENABLE_PAM_HOME', have)
have = get_option('oomd') and get_option('mode') == 'developer'
have = get_option('oomd')
if have == 'auto'
have = get_option('mode') == 'developer'
else
have = have == 'true'
if have and get_option('mode') != 'developer'
error('oomd is not available in release mode (yet)')
endif
endif
conf.set10('ENABLE_OOMD', have)
want_remote = get_option('remote')

View File

@ -97,7 +97,7 @@ option('coredump', type : 'boolean',
description : 'install the coredump handler')
option('pstore', type : 'boolean',
description : 'install the pstore archival tool')
option('oomd', type : 'boolean', value : 'false',
option('oomd', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'install the userspace oom killer')
option('logind', type : 'boolean',
description : 'install the systemd-logind stack')