[RFC] autotools/autoregen: Update autoconf and automake
Pietro Monteiro
pietro@sociotechnical.xyz
Wed Nov 18 22:25:33 GMT 2026
Hopefuly soon we'll uprade autotools on gcc/binutils/gdb.
Getting ready for that.
-- >8 --
Update autoconf to 2.73 and automake to 1.19.
Remove `--program-suffix` from the automake build. We also don't need
to symlink unversioned automake binaries to versioned ones because
both wil be installed.
Signed-off-by: Pietro Monteiro <pietro@sociotechnical.xyz>
---
builder/containers/Containerfile-autotools | 36 ++++++++++------------
builder/containers/autoregen.py | 10 +++---
2 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/builder/containers/Containerfile-autotools b/builder/containers/Containerfile-autotools
index 2efcac9..4e907b6 100644
--- a/builder/containers/Containerfile-autotools
+++ b/builder/containers/Containerfile-autotools
@@ -17,31 +17,27 @@ RUN apt-get update && \
buildbot-worker && \
apt-get clean
-# Get, build and install autoconf 2.69 and automake 1.15.1
-RUN wget https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz && \
- wget https://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.gz && \
- tar zxf autoconf-2.69.tar.gz && \
- tar zxf automake-1.15.1.tar.gz && \
- cd autoconf-2.69 && \
- ./configure --program-suffix=-2.69 && \
+# Get, build and install autoconf 2.73 and automake 1.19
+RUN wget https://ftp.gnu.org/gnu/autoconf/autoconf-2.73.tar.gz && \
+ wget https://ftp.gnu.org/gnu/automake/automake-1.19.tar.gz && \
+ tar zxf autoconf-2.73.tar.gz && \
+ tar zxf automake-1.19.tar.gz && \
+ cd autoconf-2.73 && \
+ ./configure --program-suffix=-2.73 && \
make && make install && cd .. && \
- cd automake-1.15.1 && \
- ./configure --program-suffix=-1.15.1 \
+ cd automake-1.19 && \
+ ./configure \
&& make && make install && cd ..
# Make sure we also have unversioned binaries so the system versions
-# aren't used
+# aren't used.
RUN cd /usr/local/bin && \
- ln -s aclocal-1.15.1 aclocal-1.15 && \
- ln -s aclocal-1.15.1 aclocal && \
- ln -s autoconf-2.69 autoconf && \
- ln -s autoheader-2.69 autoheader && \
- ln -s autom4te-2.69 autom4te && \
- ln -s automake-1.15.1 automake-1.15 && \
- ln -s automake-1.15.1 automake && \
- ln -s autoreconf-2.69 autoreconf && \
- ln -s autoscan-2.69 autoscan && \
- ln -s autoupdate-2.69 autoupdate
+ ln -s autoconf-2.73 autoconf && \
+ ln -s autoheader-2.73 autoheader && \
+ ln -s autom4te-2.73 autom4te && \
+ ln -s autoreconf-2.73 autoreconf && \
+ ln -s autoscan-2.73 autoscan && \
+ ln -s autoupdate-2.73 autoupdate
# Get and install the autoregen.py script
RUN wget -O /usr/local/bin/autoregen.py \
diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index 0c599b0..5c1eb3c 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -15,11 +15,11 @@ from pathlib import Path
# On Gentoo, vanilla unpatched autotools are packaged separately.
# We place the vanilla names first as we want to prefer those if both exist.
-AUTOCONF_NAMES = ["autoconf-vanilla-2.69", "autoconf-2.69", "autoconf"]
-AUTOMAKE_NAMES = ["automake-vanilla-1.15", "automake-1.15.1", "automake"]
-ACLOCAL_NAMES = ["aclocal-vanilla-1.15", "aclocal-1.15.1", "aclocal"]
-AUTOHEADER_NAMES = ["autoheader-vanilla-2.69", "autoheader-2.69", "autoheader"]
-AUTORECONF_NAMES = ["autoreconf-vanilla-2.69", "autoreconf-2.69", "autoreconf"]
+AUTOCONF_NAMES = ["autoconf-vanilla-2.73", "autoconf-2.73", "autoconf"]
+AUTOMAKE_NAMES = ["automake-vanilla-1.19", "automake-1.19", "automake"]
+ACLOCAL_NAMES = ["aclocal-vanilla-1.19", "aclocal-1.19", "aclocal"]
+AUTOHEADER_NAMES = ["autoheader-vanilla-2.73", "autoheader-2.73", "autoheader"]
+AUTORECONF_NAMES = ["autoreconf-vanilla-2.73", "autoreconf-2.73", "autoreconf"]
# Pick the first for each list that exists on this system.
AUTOCONF_BIN = next(name for name in AUTOCONF_NAMES if shutil.which(name))
--
2.56.0
More information about the Buildbot
mailing list