From 74e1c0135133a515e016e63c46c2552bfa3126a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Mon, 22 Oct 2018 16:43:57 +0300 Subject: [PATCH] meson: s/debug/internal-debug/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'debug' is a reserved option name since meson 0.48. So we must rename our own debug option to something else. Let's go with 'internal-debug'. Signed-off-by: Ville Syrjälä Signed-off-by: Chris Wilson --- meson_options.txt | 2 +- src/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 99312740..e99a8f42 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -36,7 +36,7 @@ option('use-create2', type : 'boolean', value : false, description : 'Enable use of create2 ioctl (experimental)') option('async-swap', type : 'boolean', value : false, description : 'Enable use of asynchronous swaps (experimental)') -option('debug', type : 'combo', value : 'no', choices : [ 'no', 'sync', 'memory', 'pixmap', 'full' ], +option('internal-debug', type : 'combo', value : 'no', choices : [ 'no', 'sync', 'memory', 'pixmap', 'full' ], description : 'Enable internal debugging') option('xorg-module-dir', type : 'string', value : '@libdir@/xorg/modules', description : 'Default xorg module directory') diff --git a/src/meson.build b/src/meson.build index c038ba3e..0a46e233 100644 --- a/src/meson.build +++ b/src/meson.build @@ -68,7 +68,7 @@ if with_backlight_helper config.set('USE_BACKLIGHT_HELPER', 1) endif -debug = get_option('debug') +debug = get_option('internal-debug') if debug == 'sync' config.set('DEBUG_SYNC', 1) endif