From: Paul Spooren Date: Sun, 10 Oct 2021 09:09:46 +0000 (-1000) Subject: build: prereq detect Python 3.10 for `python3` binary X-Git-Tag: v22.03.0-rc1~1573 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=56ea2bf2eec431ccd3c566190a444ad63db39b65;p=openwrt%2Fstaging%2Fhauke.git build: prereq detect Python 3.10 for `python3` binary While the binary `python3.10` is correctly detected by the build system the default `python3` binary is currently not detected if pointing to a Python 3.10 installation. Fix this by extending the grep regex. Signed-off-by: Paul Spooren --- diff --git a/include/prereq-build.mk b/include/prereq-build.mk index e1993444f7..ce6873cf52 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -162,7 +162,7 @@ $(eval $(call SetupHostCommand,python,Please install Python >= 3.6, \ python3.8 -V 2>&1 | grep 'Python 3', \ python3.7 -V 2>&1 | grep 'Python 3', \ python3.6 -V 2>&1 | grep 'Python 3', \ - python3 -V 2>&1 | grep -E 'Python 3\.[6-9]\.?')) + python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|10)\.?')) $(eval $(call SetupHostCommand,python3,Please install Python >= 3.6, \ python3.10 -V 2>&1 | grep 'Python 3', \ @@ -170,7 +170,7 @@ $(eval $(call SetupHostCommand,python3,Please install Python >= 3.6, \ python3.8 -V 2>&1 | grep 'Python 3', \ python3.7 -V 2>&1 | grep 'Python 3', \ python3.6 -V 2>&1 | grep 'Python 3', \ - python3 -V 2>&1 | grep -E 'Python 3\.[6-9]\.?')) + python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|10)\.?')) $(eval $(call TestHostCommand,python3-distutils, \ Please install the Python3 distutils module, \