public inbox for buildbot@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Containerfile-autotools: symlink versioned to unversioned binaries
@ 2023-11-15 17:25 Mark Wielaard
  0 siblings, 0 replies; only message in thread
From: Mark Wielaard @ 2023-11-15 17:25 UTC (permalink / raw)
  To: buildbot; +Cc: Mark Wielaard

---
 builder/containers/Containerfile-autotools | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/builder/containers/Containerfile-autotools b/builder/containers/Containerfile-autotools
index 02a8401..bab491f 100644
--- a/builder/containers/Containerfile-autotools
+++ b/builder/containers/Containerfile-autotools
@@ -28,6 +28,18 @@ RUN wget https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz && \
     ./configure --program-suffix=-1.15.1 \
     && make && make install && cd ..
 
+# Make sure we also have unversioned binaries so the system versions
+# aren't used
+RUN cd /usr/local/bin && \
+    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 && \
+    ln -s autoreconf-2.69 autoreconf && \
+    ln -s autoscan-2.69 autoscan && \
+    ln -s autoupdate-2.69 autoupdate
+
 # Get and install the autoregen.py script
 RUN wget -O /usr/local/bin/autoregen.py \
  'https://sourceware.org/cgit/builder/plain/builder/containers/autoregen.py' \
-- 
2.41.0


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-11-15 17:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-15 17:25 [PATCH] Containerfile-autotools: symlink versioned to unversioned binaries Mark Wielaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).