summaryrefslogtreecommitdiffstats
path: root/source/d/automake/automake.python.3.10.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/d/automake/automake.python.3.10.diff')
-rw-r--r--source/d/automake/automake.python.3.10.diff22
1 files changed, 22 insertions, 0 deletions
diff --git a/source/d/automake/automake.python.3.10.diff b/source/d/automake/automake.python.3.10.diff
new file mode 100644
index 000000000..02dd7348f
--- /dev/null
+++ b/source/d/automake/automake.python.3.10.diff
@@ -0,0 +1,22 @@
+--- ./m4/python.m4.orig 2020-01-01 13:43:28.000000000 -0600
++++ ./m4/python.m4 2021-10-15 11:40:40.523668203 -0500
+@@ -86,12 +86,14 @@
+ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+ else
+
+- dnl Query Python for its version number. Getting [:3] seems to be
+- dnl the best way to do this; it's what "site.py" does in the standard
+- dnl library.
+-
++ dnl Query Python for its version number. Although site.py simply uses
++ dnl sys.version[:3], printing that failed with Python 3.10, since the
++ 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.
++ dnl
+ 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])
+
+ dnl Use the values of $prefix and $exec_prefix for the corresponding