From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Mon, 17 Jun 2019 18:37:44 +0000 (+0000)
Subject: meson: Improve detection of Python when using Meson >=0.50.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b120a02b21791ef9898dd342af8102ec9f4d36d9;p=mesa.git

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

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)
---

diff --git a/meson.build b/meson.build
index 2da66b74924..4e1990eb600 100644
--- a/meson.build
+++ b/meson.build
@@ -746,7 +746,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',
   '''