[openwrt/openwrt] build: prereq detect Python 3.10 for `python3` binary

LEDE Commits lede-commits at lists.infradead.org
Tue Oct 12 22:19:57 PDT 2021


aparcar pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/f1f304940b72def82dc22cebd78436505f2d6b9f

commit f1f304940b72def82dc22cebd78436505f2d6b9f
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Sat Oct 9 23:09:46 2021 -1000

    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 <mail at aparcar.org>
    (cherry picked from commit 56ea2bf2eec431ccd3c566190a444ad63db39b65)
---
 include/prereq-build.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 8b6413564d..d28432f726 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -159,7 +159,7 @@ $(eval $(call SetupHostCommand,python,Please install Python >= 3.5, \
 	python3.7 -V 2>&1 | grep 'Python 3', \
 	python3.6 -V 2>&1 | grep 'Python 3', \
 	python3.5 -V 2>&1 | grep 'Python 3', \
-	python3 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?'))
+	python3 -V 2>&1 | grep -E 'Python 3\.([5-9]|10)\.?'))
 
 $(eval $(call SetupHostCommand,python3,Please install Python >= 3.5, \
 	python3.10 -V 2>&1 | grep 'Python 3', \
@@ -168,7 +168,7 @@ $(eval $(call SetupHostCommand,python3,Please install Python >= 3.5, \
 	python3.7 -V 2>&1 | grep 'Python 3', \
 	python3.6 -V 2>&1 | grep 'Python 3', \
 	python3.5 -V 2>&1 | grep 'Python 3', \
-	python3 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?'))
+	python3 -V 2>&1 | grep -E 'Python 3\.([5-9]|10)\.?'))
 
 $(eval $(call TestHostCommand,python3-distutils, \
 	Please install the Python3 distutils module, \



More information about the lede-commits mailing list