From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 19 Aug 2018 17:11:30 +0000 (+0200)
Subject: meson: rename -Ddebug to -Ddebug-extra
X-Git-Tag: archive/raspbian/239-15+rpi1^2~36
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3e419f43a0cd6073b0828372c9fd77b091442d7b;p=systemd.git

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 #9883.

(cherry picked from commit 8f6b442a78d0b485f044742ad90b2e8271b4e68e)

Gbp-Pq: Name meson-rename-Ddebug-to-Ddebug-extra.patch
---

diff --git a/meson.build b/meson.build
index 88a470a0..1d864e39 100644
--- a/meson.build
+++ b/meson.build
@@ -765,7 +765,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
 
 enable_debug_hashmap = false
 enable_debug_mmap_cache = false
-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 16c1f2b2..dc7951b9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -46,7 +46,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
        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')