Module: Mesa Branch: staging/23.3 Commit: 92cdf6cb5f25f632350d8ca0d9451b0e87194ca3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=92cdf6cb5f25f632350d8ca0d9451b0e87194ca3
Author: Yonggang Luo <[email protected]> Date: Mon Dec 18 18:16:47 2023 +0800 meson: Support for both packaging and distutils distutils was deprecated and is now gone on modern systems. so the default behavior is to use the supported thing, which is packaging.version, and when on an old system, fallback to the old distutils.version. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9943 Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26746> (cherry picked from commit 670a799ebff9a98daafccf49324c2a01311b0c41) --- .pick_status.json | 2 +- meson.build | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 423bf9ae406..3017416f462 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2464,7 +2464,7 @@ "description": "meson: Support for both packaging and distutils", "nominated": false, "nomination_type": 3, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/meson.build b/meson.build index 35cc5f1cd5f..2902c1019f6 100644 --- a/meson.build +++ b/meson.build @@ -886,9 +886,12 @@ prog_python = import('python').find_installation('python3') has_mako = run_command( prog_python, '-c', ''' -from distutils.version import StrictVersion +try: + from packaging.version import Version +except: + from distutils.version import StrictVersion as Version import mako -assert StrictVersion(mako.__version__) >= StrictVersion("0.8.0") +assert Version(mako.__version__) >= Version("0.8.0") ''', check: false) if has_mako.returncode() != 0 error('Python (3.x) mako module >= 0.8.0 required to build mesa.')
