diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-05-21 11:43:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-05-21 11:43:58 +0200 |
| commit | 23c0192166760b0d73bd39252ca72e3cfe596f6e (patch) | |
| tree | ed5100072cc4bc2f498bf0de571c49e65f31ec8a | |
| parent | 5cf94577cf2045fec87344d7d89422fe6dfce62f (diff) | |
| download | vim-git-23c0192166760b0d73bd39252ca72e3cfe596f6e.tar.gz | |
patch 8.2.2876: configure cannot detect Python 3.10v8.2.2876
Problem: Configure cannot detect Python 3.10.
Solution: Use sys.version_info. (closes #8233)
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.ac | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
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 @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2876, +/**/ 2875, /**/ 2874, |