mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
build: Fix the version of python checked for by ./configure
We previously upped the minimum python version to 2.7, but neglected to
reflect this in ./configure
Fixes: 2a353c048c ("tools: Don't use distutils in configure or Makefile")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
This commit is contained in:
1 parent
7cc95f4166
commit
64cee18837
2 files changed
+5
-5
No files matched your search
Vendored
+4
-4
@@ -8298,15 +8298,15 @@ if test x"${PYTHONPATH}" = x"no"
|
||||
then
|
||||
as_fn_error $? "Unable to find $PYTHON, please install $PYTHON" "$LINENO" 5
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python version >= 2.6 " >&5
|
||||
printf %s "checking for python version >= 2.6 ... " >&6; }
|
||||
`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 6)"))'`
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python version >= 2.7 " >&5
|
||||
printf %s "checking for python version >= 2.7 ... " >&6; }
|
||||
`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 7)"))'`
|
||||
if test "$?" != "0"
|
||||
then
|
||||
python_version=`$PYTHON -V 2>&1`
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
as_fn_error $? "$python_version is too old, minimum required version is 2.6" "$LINENO" 5
|
||||
as_fn_error $? "$python_version is too old, minimum required version is 2.7" "$LINENO" 5
|
||||
else
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
printf "%s\n" "yes" >&6; }
|
||||
|
||||
+1
-1
@@ -385,7 +385,7 @@ PYTHONPATH=$PYTHON
|
||||
PYTHON=`basename $PYTHONPATH`
|
||||
|
||||
AX_PATH_PROG_OR_FAIL([PYTHONPATH], [$PYTHON])
|
||||
AX_CHECK_PYTHON_VERSION([2], [6])
|
||||
AX_CHECK_PYTHON_VERSION([2], [7])
|
||||
|
||||
AS_IF([test "$cross_compiling" != yes], [
|
||||
AX_CHECK_PYTHON_DEVEL()
|
||||
|
||||