From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 21 May 2021 09:43:58 +0000 (+0200)
Subject: patch 8.2.2876: configure cannot detect Python 3.10
X-Git-Tag: v8.2.2876
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23c0192166760b0d73bd39252ca72e3cfe596f6e;p=vim

patch 8.2.2876: configure cannot detect Python 3.10

Problem:    Configure cannot detect Python 3.10.
Solution:   Use sys.version_info. (closes #8233)
---

diff --git a/src/auto/configure b/src/auto/configure
index 0b423a657..5702a2171 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6673,7 +6673,7 @@ if ${vi_cv_var_python3_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   vi_cv_var_python3_version=`
-          ${vi_cv_path_python3} -c 'import sys; print(sys.version[:3])'`
+          ${vi_cv_path_python3} -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))'`
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_version" >&5
diff --git a/src/configure.ac b/src/configure.ac
index cc8d61f7f..2db04496f 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1436,7 +1436,7 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic";
     dnl -- get its version number
     AC_CACHE_CHECK(Python version,vi_cv_var_python3_version,
     [[vi_cv_var_python3_version=`
-          ${vi_cv_path_python3} -c 'import sys; print(sys.version[:3])'`
+          ${vi_cv_path_python3} -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))'`
     ]])
 
     dnl -- it must be at least version 3
diff --git a/src/version.c b/src/version.c
index d593a2207..ca18b679f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2876,
 /**/
     2875,
 /**/