From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 6 Jun 2025 13:23:23 +0000 (+0200)
Subject: builder: avoid duplicate installation of meson/quiche/rust
X-Git-Tag: rec-5.3.0-alpha2~4^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adc4a45244c64cfcd52d03b8a392224c3851e1ff;p=thirdparty%2Fpdns.git

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 10b8664443..e74a0b0e40 100755
--- 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 68327d8076..6c1f0af478 100755
--- 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 0100625e61..827c70e482 100755
--- 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