Skip to content

Commit 2d54f33

Browse files
erlend-aaslandtiran
andcommitted
[3.11] pythongh-105455: Bump to GNU Autoconf v2.71 (python#104925)
Similar to pythongh-104925, but without a hard v2.71 requirement. The hard check remains at Autoconf 2.69. Co-authored-by: Christian Heimes <[email protected]>
1 parent 40d1d28 commit 2d54f33

File tree

6 files changed

+97
-31
lines changed

6 files changed

+97
-31
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ jobs:
132132
run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
133133
- name: Configure ccache action
134134
uses: hendrikmuhs/[email protected]
135-
- name: Check Autoconf version 2.69 and aclocal 1.16.3
135+
- name: Check Autoconf and aclocal versions
136136
run: |
137-
grep "Generated by GNU Autoconf 2.69" configure
138-
grep "aclocal 1.16.3" aclocal.m4
137+
grep "Generated by GNU Autoconf 2.71" configure
138+
grep "aclocal 1.16.4" aclocal.m4
139139
grep -q "runstatedir" configure
140140
grep -q "PKG_PROG_PKG_CONFIG" aclocal.m4
141141
- name: Configure CPython

Makefile.pre.in

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

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.

configure

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

configure.ac

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@ dnl ***************************************************
22
dnl * Please run autoreconf -if to test your changes! *
33
dnl ***************************************************
44
dnl
5-
dnl Python's configure.ac file requires autoconf 2.69 and autoconf-archive.
5+
dnl Python's configure script requires autoconf 2.69, autoconf-archive,
6+
dnl pkgconf's m4 macros.
7+
dnl
8+
dnl It is recommended to use a cpython_autoconf container to regenerate the
9+
dnl configure script:
10+
dnl
11+
dnl podman run --rm --pull=always -v $(pwd):/src:Z quay.io/tiran/cpython_autoconf:271
12+
dnl docker run --rm --pull=always -v $(pwd):/src quay.io/tiran/cpython_autoconf:271
613
dnl
714

815
# Set VERSION so we only need to edit in one place (i.e., here)

pyconfig.h.in

Lines changed: 77 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -781,12 +781,12 @@
781781
/* Define if you have the 'memfd_create' function. */
782782
#undef HAVE_MEMFD_CREATE
783783

784-
/* Define to 1 if you have the <memory.h> header file. */
785-
#undef HAVE_MEMORY_H
786-
787784
/* Define to 1 if you have the `memrchr' function. */
788785
#undef HAVE_MEMRCHR
789786

787+
/* Define to 1 if you have the <minix/config.h> header file. */
788+
#undef HAVE_MINIX_CONFIG_H
789+
790790
/* Define to 1 if you have the `mkdirat' function. */
791791
#undef HAVE_MKDIRAT
792792

@@ -1173,6 +1173,9 @@
11731173
/* Define to 1 if you have the <stdint.h> header file. */
11741174
#undef HAVE_STDINT_H
11751175

1176+
/* Define to 1 if you have the <stdio.h> header file. */
1177+
#undef HAVE_STDIO_H
1178+
11761179
/* Define to 1 if you have the <stdlib.h> header file. */
11771180
#undef HAVE_STDLIB_H
11781181

@@ -1681,21 +1684,87 @@
16811684
#ifndef _ALL_SOURCE
16821685
# undef _ALL_SOURCE
16831686
#endif
1687+
/* Enable general extensions on macOS. */
1688+
#ifndef _DARWIN_C_SOURCE
1689+
# undef _DARWIN_C_SOURCE
1690+
#endif
1691+
/* Enable general extensions on Solaris. */
1692+
#ifndef __EXTENSIONS__
1693+
# undef __EXTENSIONS__
1694+
#endif
16841695
/* Enable GNU extensions on systems that have them. */
16851696
#ifndef _GNU_SOURCE
16861697
# undef _GNU_SOURCE
16871698
#endif
1688-
/* Enable threading extensions on Solaris. */
1699+
/* Enable X/Open compliant socket functions that do not require linking
1700+
with -lxnet on HP-UX 11.11. */
1701+
#ifndef _HPUX_ALT_XOPEN_SOCKET_API
1702+
# undef _HPUX_ALT_XOPEN_SOCKET_API
1703+
#endif
1704+
/* Identify the host operating system as Minix.
1705+
This macro does not affect the system headers' behavior.
1706+
A future release of Autoconf may stop defining this macro. */
1707+
#ifndef _MINIX
1708+
# undef _MINIX
1709+
#endif
1710+
/* Enable general extensions on NetBSD.
1711+
Enable NetBSD compatibility extensions on Minix. */
1712+
#ifndef _NETBSD_SOURCE
1713+
# undef _NETBSD_SOURCE
1714+
#endif
1715+
/* Enable OpenBSD compatibility extensions on NetBSD.
1716+
Oddly enough, this does nothing on OpenBSD. */
1717+
#ifndef _OPENBSD_SOURCE
1718+
# undef _OPENBSD_SOURCE
1719+
#endif
1720+
/* Define to 1 if needed for POSIX-compatible behavior. */
1721+
#ifndef _POSIX_SOURCE
1722+
# undef _POSIX_SOURCE
1723+
#endif
1724+
/* Define to 2 if needed for POSIX-compatible behavior. */
1725+
#ifndef _POSIX_1_SOURCE
1726+
# undef _POSIX_1_SOURCE
1727+
#endif
1728+
/* Enable POSIX-compatible threading on Solaris. */
16891729
#ifndef _POSIX_PTHREAD_SEMANTICS
16901730
# undef _POSIX_PTHREAD_SEMANTICS
16911731
#endif
1732+
/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */
1733+
#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
1734+
# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
1735+
#endif
1736+
/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */
1737+
#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
1738+
# undef __STDC_WANT_IEC_60559_BFP_EXT__
1739+
#endif
1740+
/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */
1741+
#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
1742+
# undef __STDC_WANT_IEC_60559_DFP_EXT__
1743+
#endif
1744+
/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
1745+
#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
1746+
# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
1747+
#endif
1748+
/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */
1749+
#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
1750+
# undef __STDC_WANT_IEC_60559_TYPES_EXT__
1751+
#endif
1752+
/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */
1753+
#ifndef __STDC_WANT_LIB_EXT2__
1754+
# undef __STDC_WANT_LIB_EXT2__
1755+
#endif
1756+
/* Enable extensions specified by ISO/IEC 24747:2009. */
1757+
#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
1758+
# undef __STDC_WANT_MATH_SPEC_FUNCS__
1759+
#endif
16921760
/* Enable extensions on HP NonStop. */
16931761
#ifndef _TANDEM_SOURCE
16941762
# undef _TANDEM_SOURCE
16951763
#endif
1696-
/* Enable general extensions on Solaris. */
1697-
#ifndef __EXTENSIONS__
1698-
# undef __EXTENSIONS__
1764+
/* Enable X/Open extensions. Define to 500 only if necessary
1765+
to make mbstate_t available. */
1766+
#ifndef _XOPEN_SOURCE
1767+
# undef _XOPEN_SOURCE
16991768
#endif
17001769

17011770

@@ -1769,22 +1838,12 @@
17691838
/* This must be defined on AIX systems to enable large file support. */
17701839
#undef _LARGE_FILES
17711840

1772-
/* Define to 1 if on MINIX. */
1773-
#undef _MINIX
1774-
17751841
/* Define on NetBSD to activate all library features */
17761842
#undef _NETBSD_SOURCE
17771843

1778-
/* Define to 2 if the system does not provide POSIX.1 features except with
1779-
this defined. */
1780-
#undef _POSIX_1_SOURCE
1781-
17821844
/* Define to activate features from IEEE Stds 1003.1-2008 */
17831845
#undef _POSIX_C_SOURCE
17841846

1785-
/* Define to 1 if you need to in order for `stat' and other things to work. */
1786-
#undef _POSIX_SOURCE
1787-
17881847
/* Define if you have POSIX threads, and your system does not define that. */
17891848
#undef _POSIX_THREADS
17901849

@@ -1827,7 +1886,7 @@
18271886
/* Define to `long int' if <sys/types.h> does not define. */
18281887
#undef off_t
18291888

1830-
/* Define to `int' if <sys/types.h> does not define. */
1889+
/* Define as a signed integer type capable of holding a process identifier. */
18311890
#undef pid_t
18321891

18331892
/* Define to empty if the keyword does not work. */

0 commit comments

Comments
 (0)