From: Mark Wielaard <mark@klomp.org>
To: buildbot@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [PATCH] Containerfile-autotools: symlink versioned to unversioned binaries
Date: Wed, 15 Nov 2023 18:25:36 +0100 [thread overview]
Message-ID: <20231115172536.679632-1-mark@klomp.org> (raw)
---
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
reply other threads:[~2023-11-15 17:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231115172536.679632-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=buildbot@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).