From: Petr Štetiar Date: Thu, 14 Nov 2019 15:50:18 +0000 (+0100) Subject: build: prereq: simplify Python 3 version checks X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c001ace8bdf03fec036840638a1fa2a1edd8b2b6;p=openwrt%2Fstaging%2Fthess.git build: prereq: simplify Python 3 version checks We don't need to check if python3.5 binary is actually Python 3.5+. Signed-off-by: Petr Štetiar --- diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 4c59910056..d73f0040c3 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -144,15 +144,15 @@ $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \ $(eval $(call CleanupPython2)) $(eval $(call SetupHostCommand,python,Please install Python >= 3.5, \ - python3.7 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ - python3.6 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ - python3.5 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ + 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]\.?')) $(eval $(call SetupHostCommand,python3,Please install Python >= 3.5, \ - python3.7 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ - python3.6 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ - python3.5 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ + 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]\.?')) $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \