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 88a470a0c5f61d501ef92515455fc3a371c5d277..1d864e390e51d23bea967c9737b7684e0cf3c991 100644 (file)
--- 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 16c1f2b2fa2722713231b1d5020d0f0c69f85672..dc7951b99177ca3e8621cf55c59bd873c820bf75 100644 (file)
--- 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')