From: Arfrever Frehtes Taifersar Arahesis <[email protected]> Meson has two modules for finding python, the python3 module and the python module. Python3 is older, and has some corner cases, python is newer, has no known corner cases and can detect python2. Things have generally seemed to work okay for us using python3, but there are cases where things fall down (such as if you have python 3.4 as your default python3.
Debian provides 0.48.x in buster (testing) fedora has 0.47.x in 27 and 28 fedora has 0.48.x in 29 arch has 0.48.x cc: [email protected] distro-bug: https://bugs.gentoo.org/671308 Reviewed-by: Dylan Baker <[email protected]> --- docs/meson.html | 2 +- meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/meson.html b/docs/meson.html index 68f80d6ac42..af109d3d8b0 100644 --- a/docs/meson.html +++ b/docs/meson.html @@ -24,7 +24,7 @@ for production</strong></p> <p>The meson build is tested on Linux, macOS, Cygwin and Haiku, FreeBSD, DragonflyBSD, NetBSD, and should work on OpenBSD.</p> -<p><strong>Mesa requires Meson >= 0.45.0 to build.</strong> +<p><strong>Mesa requires Meson >= 0.46.0 to build.</strong> Some older versions of meson do not check that they are too old and will error out in odd ways. diff --git a/meson.build b/meson.build index 33f4e5ad3cf..ee2d1a82984 100644 --- a/meson.build +++ b/meson.build @@ -25,7 +25,7 @@ project( [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py'] ).stdout(), license : 'MIT', - meson_version : '>= 0.45', + meson_version : '>= 0.46', default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11'] ) @@ -709,7 +709,7 @@ if with_platform_haiku pre_args += '-DHAVE_HAIKU_PLATFORM' endif -prog_python = import('python3').find_python() +prog_python = import('python').find_installation('python3') has_mako = run_command( prog_python, '-c', ''' -- 2.19.1 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
