From: Vinson Lee <vlee@freedesktop.org>
Date: Fri, 28 Feb 2020 05:01:55 +0000 (-0800)
Subject: meson: Enable -Wno-deprecated only for bison > 2.3.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1e43910aa2e018a1819bcfef6916d5ce5e1e7276;p=mesa.git

meson: Enable -Wno-deprecated only for bison > 2.3.

Older versions of bison do not support the -W option.

Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2571
Fixes: 11a1cb2fa8da ("meson: Disable bison's -Wdeprecated since we still support old bison.")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3993>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3993>
---

diff --git a/meson.build b/meson.build
index d69b17bb157..1484e7fec5d 100644
--- a/meson.build
+++ b/meson.build
@@ -1512,7 +1512,9 @@ else
   # Disable deprecated keyword warnings, since we have to use them for
   # old-bison compat.  See discussion in
   # https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2161
-  prog_bison = [prog_bison, '-Wno-deprecated']
+  if meson.version().version_compare('>= 0.52.0') and find_program('bison', required : false, version : '> 2.3').found()
+    prog_bison = [prog_bison, '-Wno-deprecated']
+  endif
 
   prog_flex = find_program('flex', required : with_any_opengl)
 endif