fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 16:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: Improve detection of Python when using Meson >=0.50.

Browse source 
Previously, on systems where multiple versions of Python 3 (e.g. 3.6 and 3.7)
are installed, wrong version of Python 3 could have been used.

The proper fix requires availability of path() method in Meson's python
module, which has been added in Meson 0.50:
https://github.com/mesonbuild/meson/pull/4616

Distro Bug: https://bugs.gentoo.org/671308
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>

v2: - Add missing `endif` keyword (Dylan)
(cherry picked from commit b120a02b21)
This commit is contained in:
Arfrever Frehtes Taifersar Arahesis 2019-06-17 18:37:44 +00:00 • committed by Juan A. Suarez Romero
parent 3d0e6d3cff
commit cb3072488c
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -754,7 +754,11 @@ if with_platform_haiku
pre_args += '-DHAVE_HAIKU_PLATFORM'
endif
prog_python = import('python3').find_python()
if meson.version().version_compare('>=0.50')
prog_python = import('python').find_installation('python3')
else
prog_python = import('python3').find_python()
endif
has_mako = run_command(
prog_python, '-c',
'''