From 0b47dabe18061b76b66fd56e443d0f74313fce39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 19 Aug 2018 19:11:30 +0200 Subject: meson: rename -Ddebug to -Ddebug-extra Meson added -Doptimization and -Ddebug options, which obviously causes a conflict with our -Ddebug options. Let's rename it. Closes #76. --- meson_options.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index 3c3b4cb30..05f80ba1a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -72,7 +72,7 @@ option('kexec-path', type : 'string', description : 'path to kexec') # description : 'path to debug shell binary') # option('debug-tty', type : 'string', value : '/dev/tty9', # description : 'specify the tty device for debug shell') -# option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], +# option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], # description : 'enable extra debugging') # option('memory-accounting-default', type : 'boolean', # description : 'enable MemoryAccounting= by default') @@ -80,7 +80,7 @@ option('kexec-path', type : 'string', description : 'path to kexec') option('valgrind', type : 'boolean', value : false, description : 'do extra operations to avoid valgrind warnings') #if 1 /// Add an extra debugging option for elogind -option('debug', type : 'array', choices : ['elogind', 'hashmap', 'mmap-cache'], value : [], +option('debug-extra', type : 'array', choices : ['elogind', 'hashmap', 'mmap-cache'], value : [], description : 'enable extra debugging') #endif // 1 -- cgit v1.2.3