isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

determine Python (3.10) version number correctly.

Browse Source 
from upstream automake
This commit is contained in:
Todd C. Miller
2021-04-16 14:06:07 -06:00
parent fbbf602664
commit 5ffa915c9c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -19594,7 +19594,7 @@ if test ${am_cv_python_version+y}
then : then :
printf %s "(cached) " >&6 printf %s "(cached) " >&6
else $as_nop else $as_nop
am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[:2])"`
fi fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
printf "%s\n" "$am_cv_python_version" >&6; } printf "%s\n" "$am_cv_python_version" >&6; }

12
m4/python.m4
View File

@@ -1,7 +1,7 @@
## ------------------------ -*- Autoconf -*- ## ------------------------ -*- Autoconf -*-
## Python file handling ## Python file handling
## From Andrew Dalke ## From Andrew Dalke
## Updated by James Henstridge ## Updated by James Henstridge and other contributors.
## ------------------------ ## ------------------------
# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Copyright (C) 1999-2020 Free Software Foundation, Inc.
# #
@@ -86,12 +86,14 @@ AC_DEFUN([AM_PATH_PYTHON],
m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
else else
dnl Query Python for its version number. Getting [:3] seems to be dnl Query Python for its version number. Although site.py simply uses
dnl the best way to do this; it's what "site.py" does in the standard dnl sys.version[:3], printing that failed with Python 3.10, since the
dnl library. dnl trailing zero was eliminated. So now we output just the major
dnl and minor version numbers, as numbers. Apparently the tertiary
dnl version is not of interest.
AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
[am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
dnl Use the values of $prefix and $exec_prefix for the corresponding dnl Use the values of $prefix and $exec_prefix for the corresponding