(backport) 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.

Change-Id: Ie9b822d6b18b551c56158447cc042faceb805842

diff --git a/meson.build b/meson.build
index 3f64c19..d6e1680 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -615,7 +615,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 substs.set('SUSHELL', get_option('debug-shell'))
 substs.set('DEBUGTTY', get_option('debug-tty'))
 
-debug = get_option('debug')
+debug = get_option('debug-extra')
 if debug != ''
         foreach name : debug.split(',')
                 if name == 'hashmap'

diff --git a/meson_options.txt b/meson_options.txt
index 1594fec..5b242da 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,7 +34,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 : 'string',
+option('debug-extra', type : 'string',
        description : 'enable extra debugging (hashmap,mmap-cache)')
 
 option('utmp', type : 'boolean',