Skip to content

Commit

Permalink
build: prereq detect Python 3.10 for python3 binary
Browse files Browse the repository at this point in the history
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@aparcar.org>
(cherry picked from commit 56ea2bf)
  • Loading branch information
aparcar committed Oct 13, 2021
1 parent e7c5e08 commit f1f3049
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/prereq-build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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', \
Expand All @@ -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, \
Expand Down

0 comments on commit f1f3049

Please sign in to comment.