Skip to content

Commit 83c7386

Browse files
[3.12] GH-89886: Bump to GNU Autoconf v2.71 (#104925) (#105207)
Co-authored-by: Christian Heimes <christian@python.org>
1 parent 25543ae commit 83c7386

File tree

8 files changed

+10919
-7754
lines changed

8 files changed

+10919
-7754
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ jobs:
143143
run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
144144
- name: Configure ccache action
145145
uses: hendrikmuhs/ccache-action@v1.2
146-
- name: Check Autoconf version 2.69 and aclocal 1.16.3
146+
- name: Check Autoconf and aclocal versions
147147
run: |
148-
grep "Generated by GNU Autoconf 2.69" configure
149-
grep "aclocal 1.16.3" aclocal.m4
148+
grep "Generated by GNU Autoconf 2.71" configure
149+
grep "aclocal 1.16.4" aclocal.m4
150150
grep -q "runstatedir" configure
151151
grep -q "PKG_PROG_PKG_CONFIG" aclocal.m4
152152
- name: Configure CPython

Doc/whatsnew/3.12.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,6 +1506,10 @@ Build Changes
15061506

15071507
* ``PYTHON_FOR_REGEN`` now require Python 3.10 or newer.
15081508

1509+
* Autoconf 2.71 and aclocal 1.16.4 is now required to regenerate
1510+
:file:`!configure`.
1511+
(Contributed by Christian Heimes in :gh:`89886`.)
1512+
15091513

15101514
C API Changes
15111515
=============

Makefile.pre.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2584,7 +2584,7 @@ regen-configure:
25842584
@if command -v podman >/dev/null; then RUNTIME="podman"; else RUNTIME="docker"; fi; \
25852585
if ! command -v $$RUNTIME; then echo "$@ needs either Podman or Docker container runtime." >&2; exit 1; fi; \
25862586
if command -v selinuxenabled >/dev/null && selinuxenabled; then OPT=":Z"; fi; \
2587-
CMD="$$RUNTIME run --rm --pull=always -v $(abs_srcdir):/src$$OPT quay.io/tiran/cpython_autoconf:269"; \
2587+
CMD="$$RUNTIME run --rm --pull=always -v $(abs_srcdir):/src$$OPT quay.io/tiran/cpython_autoconf:271"; \
25882588
echo $$CMD; \
25892589
$$CMD || exit $?
25902590

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Autoconf 2.71 and aclocal 1.16.4 is now required to regenerate
2+
:file:`!configure`.

aclocal.m4

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy