From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
'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ä <ville.syrjala@xxxxxxxxxxxxxxx>
---
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 993127408cb4..e99a8f42cc51 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 c038ba3ed989..0a46e233a94c 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
--
2.18.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
