]> xenbits.xensource.com Git - xen.git/commitdiff
build: Fix the version of python checked for by ./configure
authorAndrew Cooper <andrew.cooper3@citrix.com>
Thu, 4 Jul 2024 12:08:40 +0000 (13:08 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Mon, 8 Jul 2024 13:46:12 +0000 (14:46 +0100)
We previously upped the minimum python version to 2.7, but neglected to
reflect this in ./configure

Fixes: 2a353c048c68 ("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>
tools/configure
tools/configure.ac

index 6c1084b7b28a2254c03ac7aac14288f867a5704e..d160ca2962021ad21dc22db9de0d87ca6ed9152a 100755 (executable)
@@ -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; }
index ac0fdc4314c4108201ac57c239d30e3a0f599cf5..be58f06be45063482bb010c8ad1d9bd5e8b225c5 100644 (file)
@@ -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()