520aa7fdb7
Backporting 2 patches from upstream. The first patch enable automake to look for python versions with multiple digits when auto-detecting the default system python interpreter version. The second allows automake to properly pick automake version (up to python 3.15) when it was specified by the user and yet different from the default system interpreter. Resolves: rhbz#2209821
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 930a9a73f4bb776ec334eff4cf6e182802841daa Mon Sep 17 00:00:00 2001
|
|
From: Mike Frysinger <vapier@gentoo.org>
|
|
Date: Wed, 26 Jan 2022 06:33:19 -0500
|
|
Subject: [PATCH] python: add 3.10 - 3.15 to the version search list
|
|
|
|
Fixes automake bug https://bugs.gnu.org/53530.
|
|
|
|
Based on the cadence of Automake releases, add the current Python
|
|
release (3.10), the current Python development (3.11), and then 4
|
|
more versions on top of that. It doesn't hurt to check for a few
|
|
extra versions here since this is the fallback logic when the main
|
|
`python` and `python3` programs aren't found.
|
|
|
|
* m4/python.m4: Add python3.10 - python3.15.
|
|
* NEWS: Mention new Python versions.
|
|
|
|
Conflicts:
|
|
- NEWS (removed)
|
|
---
|
|
m4/python.m4 | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/m4/python.m4 b/m4/python.m4
|
|
index 4a007fd75..4bf72286a 100644
|
|
--- a/m4/python.m4
|
|
+++ b/m4/python.m4
|
|
@@ -38,6 +38,7 @@ AC_DEFUN([AM_PATH_PYTHON],
|
|
dnl supported. (2.0 was released on October 16, 2000).
|
|
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
|
|
[python python2 python3 dnl
|
|
+ python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 dnl
|
|
python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
|
|
python3.2 python3.1 python3.0 dnl
|
|
python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
|
|
--
|
|
2.41.0
|
|
|