Update patch for Python 3.10 support

This commit is contained in:
Björn Esser 2021-08-05 20:01:24 +02:00
parent 17bded5ffd
commit b36f98e5a2
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 41 additions and 6 deletions

View File

@ -1,13 +1,45 @@
Index: autoconf-archive-2021.02.19/m4/ax_python.m4
===================================================================
--- autoconf-archive-2021.02.19.orig/m4/ax_python.m4
+++ autoconf-archive-2021.02.19/m4/ax_python.m4
From 3c4b846823be9094fc3c3987e1b807741af6da3b Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 5 Aug 2021 11:12:47 -0400
Subject: [PATCH 1/2] AX_PYTHON_DEVEL: fix for Python 3.10+
---
m4/ax_python_devel.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
index 9d4eecf7..d30ee943 100644
--- a/m4/ax_python_devel.m4
+++ b/m4/ax_python_devel.m4
@@ -208,7 +208,7 @@ EOD`
ac_python_version=$PYTHON_VERSION
else
ac_python_version=`$PYTHON -c "import sys; \
- print (sys.version[[:3]])"`
+ print ("%d.%d" % sys.version_info[[:2]])"`
fi
fi
From 03c32bcc6763ff8b9a51f2b7e01f6862e61ef440 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 5 Aug 2021 11:27:24 -0400
Subject: [PATCH 2/2] AX_PYTHON: Add 3.10 and 3.11
---
m4/ax_python.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/ax_python.m4 b/m4/ax_python.m4
index 7c9f511f..c2577905 100644
--- a/m4/ax_python.m4
+++ b/m4/ax_python.m4
@@ -55,7 +55,7 @@
AC_DEFUN([AX_PYTHON],
[AC_MSG_CHECKING(for python build information)
AC_MSG_RESULT([])
-for python in python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
+for python in python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
+for python in python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
AC_CHECK_PROGS(PYTHON_BIN, [$python])
ax_python_bin=$PYTHON_BIN
if test x$ax_python_bin != x; then

View File

@ -1,6 +1,6 @@
Name: autoconf-archive
Version: 2021.02.19
Release: 3%{?dist}
Release: 4%{?dist}
Summary: The Autoconf Macro Archive
License: GPLv3+ with exceptions
URL: https://www.gnu.org/software/autoconf-archive/
@ -44,6 +44,9 @@ rm -frv %{buildroot}%{_datadir}/doc/%{name}
%{_infodir}/autoconf-archive.info*
%changelog
* Thu Aug 05 2021 Björn Esser <besser82@fedoraproject.org> - 2021.02.19-4
- Update patch for Python 3.10 support
* Thu Aug 05 2021 Björn Esser <besser82@fedoraproject.org> - 2021.02.19-3
- Add support for Python 3.10