summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-08-19 19:11:30 +0200
committerSven Eden <yamakuzure@gmx.net>2018-09-26 07:45:58 +0200
commit0fcb473bf4815c1d5fc2ea6051d7272571b9df2b (patch)
treef6df53be7861271d05d300893227e091c8d78af1
parent612bbecd2f2904be8ecb84f03a5bad3fff05a467 (diff)
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. Fixes #76.
-rw-r--r--meson.build2
-rw-r--r--meson_options.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 0d096d847..8b62c789e 100644
--- a/meson.build
+++ b/meson.build
@@ -895,7 +895,7 @@ enable_debug_mmap_cache = false
#if 1 /// additional elogind debug mode
enable_debug_elogind = false
#endif // 1
-foreach name : get_option('debug')
+foreach name : get_option('debug-extra')
if name == 'hashmap'
enable_debug_hashmap = true
elif name == 'mmap-cache'
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