From 9e38cffdfc96d4f23fd8644140469e48cc1920a1 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 21 Mar 2022 13:17:32 +0000 Subject: [PATCH] Revert "meson: simplify lookup of python command" This reverts commit 4a4d9eb6624b69328fa9749236c0b4236932ceb8. It seems to cause build failures with `VsDevCmd.bat` 2022: ``` ..\meson.build:2274:0: ERROR: Command "C:\Program Files\Meson\meson.exe runpython --version" failed with status 2. ``` Revert it for now until this can be fixed in Meson. See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2541#note_1410521 --- meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 22220cd65..7dc6ff874 100644 --- a/meson.build +++ b/meson.build @@ -2271,10 +2271,16 @@ endif glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline) -python = find_program('python3', version: '>=3.5') +python = import('python').find_installation('python3') # used for '#!/usr/bin/env ' python_name = 'python3' +python_version = python.language_version() +python_version_req = '>=3.5' +if not python_version.version_compare(python_version_req) + error('Requires Python @0@, @1@ found.'.format(python_version_req, python_version)) +endif + # Determine which user environment-dependent files that we want to install have_bash = find_program('bash', required : false).found() # For completion scripts bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)