dsg/mesa
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

meson: Clearly print error when distutils or packaging is missing

Browse source 
Previously, if neither packaging.version or distutils.version is present
in the environment the has_mako check would return non-zero exit code
and meson would print that mako is required which is misleading since
mako can be in the environment but not packaging or distutils. This can
happen for Python>=3.12 where distutils is no longer in the Python
stdlib but provided externally by setuptools.

Signed-off-by: bbhtt <bbhtt.zn0i8@slmail.me>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36697>
This commit is contained in:
bbhtt 2025-08-09 11:38:14 +05:30 • committed by Marge Bot
parent c11f47481a
commit 9f33645d2c
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
meson.build
View file

@ -924,15 +924,29 @@ prog_python = find_program('python3', 'python', version : '>= 3.9')
has_mako = run_command(
prog_python, '-c',
'''
import sys
try:
from packaging.version import Version
try:
from packaging.version import Version
except:
from distutils.version import StrictVersion as Version
except:
from distutils.version import StrictVersion as Version
import mako
assert Version(mako.__version__) >= Version("0.8.0")
''', check: false)
if has_mako.returncode() != 0
sys.exit(2)
try:
import mako
except:
sys.exit(1)
if Version(mako.__version__) < Version("0.8.0"):
sys.exit(1)
''', check: false)
if has_mako.returncode() == 1
error('Python (3.x) mako module >= 0.8.0 required to build mesa.')
elif has_mako.returncode() == 2
error('One of Python (3.x) packaging or distutils module is required.')
endif
has_yaml = run_command(