From 48d68297393c8b3699dd1ccabfe2e30b84c0a624 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Fri, 10 Aug 2018 17:41:29 +0200 Subject: Build system: Fix various issues that came from errornous migration. No matter how much advanced check_tree.pl is, there are plenty possibilities where upstream changes can be transported wrong. Mainly adding something we then have to mask out. But at the end of the day this is actually wanted, so we do not miss important changes. --- meson_options.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index 487c43c55..37d434191 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,9 +14,11 @@ option('rootprefix', type : 'string', # description : 'link systemd-udev and its helpers to libsystemd-shared.so') # option('link-systemctl-shared', type: 'boolean', # description : 'link systemctl against libsystemd-shared.so') -# option('static-libsystemd', type : 'combo', -# choices : ['false', 'true', 'pic', 'no-pic'], -# description : '''install a static library for libsystemd''') +#endif // 0 +option('static-libelogind', type : 'combo', + choices : ['false', 'true', 'pic', 'no-pic'], + description : '''install a static library for libelogind''') +#if 0 /// UNNEEDED by elogind # option('static-libudev', type : 'combo', # choices : ['false', 'true', 'pic', 'no-pic'], # description : '''install a static library for libudev''') @@ -77,8 +79,8 @@ option('kexec-path', type : 'string', description : 'path to kexec') # option('valgrind', type : 'boolean', value : false, # description : 'do extra operations to avoid valgrind warnings') #else -option('debug', type : 'string', - description : 'enable extra debugging (elogind,hashmap,mmap-cache)') +option('debug', type : 'array', choices : ['elogind', 'hashmap', 'mmap-cache'], value : [], + description : 'enable extra debugging') #endif // 0 option('utmp', type : 'boolean', -- cgit v1.2.3