builder: avoid duplicate installation of meson/quiche/rust

diff --git a/builder-support/helpers/install_meson.sh b/builder-support/helpers/install_meson.sh
index 10b8664443ecb1c174f787329c0635586bd23318..e74a0b0e40d313dc3aa058ff7c6cf8611f83e6e2 100755 (executable)
--- a/builder-support/helpers/install_meson.sh
+++ b/builder-support/helpers/install_meson.sh
@@ -2,6 +2,8 @@
 set -v
 set -e
 
+[ -e /tmp/.pdns_meson_installed ] && exit 0  # we already have meson, let's assume we put it there earlier
+
 readonly MESON_VERSION=$(jq -r .version < meson.json)
 readonly MESON_TARBALL="${MESON_VERSION}.tar.gz"
 readonly MESON_TARBALL_URL="https://github.com/mesonbuild/meson/archive/${MESON_TARBALL}"
@@ -31,3 +33,5 @@ fi
 
 cd ..
 rm -rf "${MESON_TARBALL}" "meson-${MESON_VERSION}"
+
+touch /tmp/.pdns_meson_installed

diff --git a/builder-support/helpers/install_quiche.sh b/builder-support/helpers/install_quiche.sh
index 68327d8076616c9f3f6b7fa746dfba1106cbea13..6c1f0af478162fec5c41c979b9f729575bfc1ddd 100755 (executable)
--- a/builder-support/helpers/install_quiche.sh
+++ b/builder-support/helpers/install_quiche.sh
@@ -2,6 +2,8 @@
 set -v
 set -e
 
+[ -e /tmp/.pdns_quiche_installed ] && exit 0
+
 readonly QUICHE_VERSION=$(jq -r .version < quiche.json)
 readonly QUICHE_TARBALL="${QUICHE_VERSION}.tar.gz"
 readonly QUICHE_TARBALL_URL="https://github.com/cloudflare/quiche/archive/${QUICHE_TARBALL}"
@@ -73,3 +75,5 @@ PC
 
 cd ..
 rm -rf "${QUICHE_TARBALL}" "quiche-${QUICHE_VERSION}"
+
+touch /tmp/.pdns_quiche_installed

diff --git a/builder-support/helpers/install_rust.sh b/builder-support/helpers/install_rust.sh
index 0100625e61996aa53b6afe6aac45c533c8f0a1ed..827c70e4820acf57ce8348ff04cbcd83ad318379 100755 (executable)
--- a/builder-support/helpers/install_rust.sh
+++ b/builder-support/helpers/install_rust.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+[ -e /tmp/.pdns_rust_installed ] && exit 0
+
 ARCH=$(arch)
 
 # Default version
@@ -52,3 +54,5 @@ cd $RUST_VERSION
 
 cd ..
 rm -rf $RUST_VERSION
+
+touch /tmp/.pdns_rust_installed