From 279c4822c536d60007404e1b44a924e9fd35766f Mon Sep 17 00:00:00 2001 From: Luc Ma Date: Fri, 14 Apr 2023 18:53:57 +0800 Subject: [PATCH] meson: keep Mako version checking in accord with build msg Fixes: 52194ae4df1 ("meson: Ensure that mako is >= 0.8.0") Signed-off-by: Luc Ma Reported-by: Terry Zhang Part-of: (cherry picked from commit b5a9021708d87d17538e0e27fe4ad6a5e20fa9a9) --- .pick_status.json | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 097ad28f07f..fda36ea2809 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -292,7 +292,7 @@ "description": "meson: keep Mako version checking in accord with build msg", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "52194ae4df18c7211cef69354a686eabc297a18d" }, diff --git a/meson.build b/meson.build index a09ad156dd2..305b34df794 100644 --- a/meson.build +++ b/meson.build @@ -841,7 +841,7 @@ has_mako = run_command( ''' from distutils.version import StrictVersion import mako -assert StrictVersion(mako.__version__) > StrictVersion("0.8.0") +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.')