From: Jan Janssen <medhefgo@web.de>
Date: Mon, 23 Jan 2023 13:54:28 +0000 (+0100)
Subject: meson: Use python module for detection
X-Git-Tag: v253-rc1~28^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F26157%2Fhead;p=thirdparty%2Fsystemd.git

meson: Use python module for detection
---

diff --git a/meson.build b/meson.build
index edf4dcc5d9b..8ab8d51b4bd 100644
--- a/meson.build
+++ b/meson.build
@@ -1971,14 +1971,10 @@ jinja2_cmdline = [meson_render_jinja2, config_h, version_h]
 
 ############################################################
 
-python = find_program('python3')
-if run_command(python, '-c', 'import jinja2', check : false).returncode() != 0
-        error('python3 jinja2 missing')
-endif
+pymod = import('python')
+python = pymod.find_installation('python3', required : true, modules : ['jinja2'])
+python_39 = python.language_version().version_compare('>=3.9')
 
-python_39 = run_command(python, '-c',
-                        'import sys; sys.exit(0 if sys.version_info >= (3,9) else 1)',
-                        check : false).returncode() == 0
 if get_option('ukify') == 'auto'
     want_ukify = python_39  and conf.get('HAVE_GNU_EFI') == 1
 elif get_option('ukify') == 'true' and (not python_39 or conf.get('HAVE_GNU_EFI') != 1)