Skip to content

Commit

Permalink
[3.12] GH-89886: Bump to GNU Autoconf v2.71 (#104925) (#105207)
Browse files Browse the repository at this point in the history
Co-authored-by: Christian Heimes <christian@python.org>
  • Loading branch information
erlend-aasland and tiran committed Jun 1, 2023
1 parent 25543ae commit 83c7386
Show file tree
Hide file tree
Showing 8 changed files with 10,919 additions and 7,754 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ jobs:
run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
- name: Configure ccache action
uses: hendrikmuhs/ccache-action@v1.2
- name: Check Autoconf version 2.69 and aclocal 1.16.3
- name: Check Autoconf and aclocal versions
run: |
grep "Generated by GNU Autoconf 2.69" configure
grep "aclocal 1.16.3" aclocal.m4
grep "Generated by GNU Autoconf 2.71" configure
grep "aclocal 1.16.4" aclocal.m4
grep -q "runstatedir" configure
grep -q "PKG_PROG_PKG_CONFIG" aclocal.m4
- name: Configure CPython
Expand Down
4 changes: 4 additions & 0 deletions Doc/whatsnew/3.12.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1506,6 +1506,10 @@ Build Changes

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

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


C API Changes
=============
Expand Down
2 changes: 1 addition & 1 deletion Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -2584,7 +2584,7 @@ regen-configure:
@if command -v podman >/dev/null; then RUNTIME="podman"; else RUNTIME="docker"; fi; \
if ! command -v $$RUNTIME; then echo "$@ needs either Podman or Docker container runtime." >&2; exit 1; fi; \
if command -v selinuxenabled >/dev/null && selinuxenabled; then OPT=":Z"; fi; \
CMD="$$RUNTIME run --rm --pull=always -v $(abs_srcdir):/src$$OPT quay.io/tiran/cpython_autoconf:269"; \
CMD="$$RUNTIME run --rm --pull=always -v $(abs_srcdir):/src$$OPT quay.io/tiran/cpython_autoconf:271"; \
echo $$CMD; \
$$CMD || exit $?

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Autoconf 2.71 and aclocal 1.16.4 is now required to regenerate
:file:`!configure`.
12 changes: 6 additions & 6 deletions aclocal.m4

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 83c7386

Please sign in to comment.