|
 |
36e8a3 |
From 9c1b72de44e68ad80be7c0b98df110e7b127072d Mon Sep 17 00:00:00 2001
|
|
|
36e8a3 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
36e8a3 |
Date: Sun, 19 Aug 2018 19:11:30 +0200
|
|
|
36e8a3 |
Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
|
|
|
36e8a3 |
|
|
|
36e8a3 |
Meson added -Doptimization and -Ddebug options, which obviously causes
|
|
|
36e8a3 |
a conflict with our -Ddebug options. Let's rename it.
|
|
|
36e8a3 |
|
|
|
36e8a3 |
Fixes #9883.
|
|
|
36e8a3 |
|
|
|
36e8a3 |
Cherry-picked from: 8f6b442a78d0b485f044742ad90b2e8271b4e68e
|
|
|
36e8a3 |
---
|
|
|
36e8a3 |
meson.build | 2 +-
|
|
|
36e8a3 |
meson_options.txt | 2 +-
|
|
|
36e8a3 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
36e8a3 |
|
|
|
36e8a3 |
diff --git a/meson.build b/meson.build
|
|
|
4bff0a |
index f308db2631..ebc55872c9 100644
|
|
|
36e8a3 |
--- a/meson.build
|
|
|
36e8a3 |
+++ b/meson.build
|
|
|
36e8a3 |
@@ -769,7 +769,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
|
|
|
36e8a3 |
|
|
|
36e8a3 |
enable_debug_hashmap = false
|
|
|
36e8a3 |
enable_debug_mmap_cache = false
|
|
|
36e8a3 |
-foreach name : get_option('debug')
|
|
|
36e8a3 |
+foreach name : get_option('debug-extra')
|
|
|
36e8a3 |
if name == 'hashmap'
|
|
|
36e8a3 |
enable_debug_hashmap = true
|
|
|
36e8a3 |
elif name == 'mmap-cache'
|
|
|
36e8a3 |
diff --git a/meson_options.txt b/meson_options.txt
|
|
|
4bff0a |
index ab2a658713..5716f45ccf 100644
|
|
|
36e8a3 |
--- a/meson_options.txt
|
|
|
36e8a3 |
+++ b/meson_options.txt
|
|
|
36e8a3 |
@@ -46,7 +46,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
|
|
|
36e8a3 |
description : 'path to debug shell binary')
|
|
|
36e8a3 |
option('debug-tty', type : 'string', value : '/dev/tty9',
|
|
|
36e8a3 |
description : 'specify the tty device for debug shell')
|
|
|
36e8a3 |
-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
|
|
|
36e8a3 |
+option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
|
|
|
36e8a3 |
description : 'enable extra debugging')
|
|
|
36e8a3 |
option('memory-accounting-default', type : 'boolean',
|
|
|
36e8a3 |
description : 'enable MemoryAccounting= by default')
|