1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 63c4b947c4fddbefd8d35acf6dffdaf34d6077ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 19 Aug 2018 19:11:30 +0200
Subject: [PATCH] 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.
---
meson.build | 2 +-
meson_options.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 05a257d1f..117af9e5e 100644
--- a/meson.build
+++ b/meson.build
@@ -936,7 +936,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
# substs.set('DEBUGTTY', get_option('debug-tty'))
#endif // 0
-debug = get_option('debug')
+debug = get_option('debug-extra')
enable_debug_hashmap = false
enable_debug_mmap_cache = false
#if 1 /// additional elogind debug mode
diff --git a/meson_options.txt b/meson_options.txt
index 84100b629..f12b542e5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -77,12 +77,12 @@ 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 : 'string',
+# option('debug-extra', type : 'string',
# description : 'enable extra debugging (hashmap,mmap-cache)')
# option('memory-accounting-default', type : 'boolean',
# description : 'enable MemoryAccounting= by default')
#else
-option('debug', type : 'string',
+option('debug-extra', type : 'string',
description : 'enable extra debugging (elogind,hashmap,mmap-cache)')
#endif // 0
|
GitWeb
