Mesa (main): meson: add check kwarg to run_command

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jan 19 05:17:38 UTC 2022


Module: Mesa
Branch: main
Commit: 9e839620daa0d157230acfa2fe84cd9dc248031e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e839620daa0d157230acfa2fe84cd9dc248031e

Author: Thomas H.P. Andersen <phomes at gmail.com>
Date:   Wed Jan 19 00:59:39 2022 +0100

meson: add check kwarg to run_command

run_command will change the default for the check arg to true
in the future. If it is true then meson will exit if the command
fails. It must be false here as we check the return code to
provide a meaningful error message.

With meson 0.61 we get the following warning:

WARNING: You should add the boolean check kwarg to the run_command call.
         It currently defaults to false,
         but it will default to true in future releases of meson.
         See also: https://github.com/mesonbuild/meson/issues/9300

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14602>

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 08f39306a29..50d067984ca 100644
--- a/meson.build
+++ b/meson.build
@@ -996,7 +996,7 @@ has_mako = run_command(
 from distutils.version import StrictVersion
 import mako
 assert StrictVersion(mako.__version__) > StrictVersion("0.8.0")
-  ''')
+  ''', check: false)
 if has_mako.returncode() != 0
   error('Python (3.x) mako module >= 0.8.0 required to build mesa.')
 endif



More information about the mesa-commit mailing list