| Brad Bishop | 977dc1a | 2019-02-06 16:01:43 -0500 | [diff] [blame] | 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 | Upstream-Status: Backport |
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 12 | --- |
| 13 | meson.build | 2 +- |
| 14 | meson_options.txt | 2 +- |
| 15 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/meson.build b/meson.build |
| 18 | index f79ac4b12..2209c935a 100644 |
| 19 | --- a/meson.build |
| 20 | +++ b/meson.build |
| 21 | @@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) |
| 22 | |
| 23 | enable_debug_hashmap = false |
| 24 | enable_debug_mmap_cache = false |
| 25 | -foreach name : get_option('debug') |
| 26 | +foreach name : get_option('debug-extra') |
| 27 | if name == 'hashmap' |
| 28 | enable_debug_hashmap = true |
| 29 | elif name == 'mmap-cache' |
| 30 | diff --git a/meson_options.txt b/meson_options.txt |
| 31 | index e3140c8c1..7b1f61bf4 100644 |
| 32 | --- a/meson_options.txt |
| 33 | +++ b/meson_options.txt |
| 34 | @@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', |
| 35 | description : 'path to debug shell binary') |
| 36 | option('debug-tty', type : 'string', value : '/dev/tty9', |
| 37 | description : 'specify the tty device for debug shell') |
| 38 | -option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], |
| 39 | +option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], |
| 40 | description : 'enable extra debugging') |
| 41 | option('memory-accounting-default', type : 'boolean', |
| 42 | description : 'enable MemoryAccounting= by default') |
| 43 | -- |
| 44 | 2.17.1 |
| 45 | |