]>
Commit | Line | Data |
---|---|---|
e01b4c45 JP |
1 | From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> | |
3 | Date: Sun, 19 Aug 2018 19:11:30 +0200 | |
4 | Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra | |
5 | ||
6 | Meson added -Doptimization and -Ddebug options, which obviously causes | |
7 | a conflict with our -Ddebug options. Let's rename it. | |
8 | ||
9 | Fixes #9883. | |
10 | --- | |
11 | meson.build | 2 +- | |
12 | meson_options.txt | 2 +- | |
13 | 2 files changed, 2 insertions(+), 2 deletions(-) | |
14 | ||
15 | diff --git a/meson.build b/meson.build | |
16 | index f79ac4b12e7..2209c935ad6 100644 | |
17 | --- a/meson.build | |
18 | +++ b/meson.build | |
19 | @@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) | |
20 | ||
21 | enable_debug_hashmap = false | |
22 | enable_debug_mmap_cache = false | |
23 | -foreach name : get_option('debug') | |
24 | +foreach name : get_option('debug-extra') | |
25 | if name == 'hashmap' | |
26 | enable_debug_hashmap = true | |
27 | elif name == 'mmap-cache' | |
28 | diff --git a/meson_options.txt b/meson_options.txt | |
29 | index e3140c8c110..7b1f61bf464 100644 | |
30 | --- a/meson_options.txt | |
31 | +++ b/meson_options.txt | |
32 | @@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', | |
33 | description : 'path to debug shell binary') | |
34 | option('debug-tty', type : 'string', value : '/dev/tty9', | |
35 | description : 'specify the tty device for debug shell') | |
36 | -option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], | |
37 | +option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], | |
38 | description : 'enable extra debugging') | |
39 | option('memory-accounting-default', type : 'boolean', | |
40 | description : 'enable MemoryAccounting= by default') |