From 26be1fb425725196c8e64fbd3e5f23cc23ac9c03 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Mon, 22 Jun 2026 18:44:49 +0200 Subject: [PATCH 1/2] external_deps: reusable PKG_TARBALL --- external_deps/build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/external_deps/build.sh b/external_deps/build.sh index e5e77cf91a..e39f435786 100755 --- a/external_deps/build.sh +++ b/external_deps/build.sh @@ -1275,20 +1275,20 @@ build_install() { # Create a redistributable package for the dependencies build_package() { cd "${WORK_DIR}" - rm -f "${PKG_BASEDIR}.tar.xz" + rm -f "${PKG_TARBALL}" local XZ_OPT='-9' case "${PLATFORM}" in windows-*-*) - tar --dereference -cvJf "${PKG_BASEDIR}.tar.xz" "${PKG_BASEDIR}" + tar --dereference -cvJf "${PKG_TARBALL}" "${PKG_BASEDIR}" ;; *) - tar -cvJf "${PKG_BASEDIR}.tar.xz" "${PKG_BASEDIR}" + tar -cvJf "${PKG_TARBALL}" "${PKG_BASEDIR}" ;; esac } build_wipe() { - rm -rf "${BUILD_BASEDIR}/" "${PKG_BASEDIR}/" "${PKG_BASEDIR}.tar.xz" + rm -rf "${BUILD_BASEDIR}/" "${PKG_BASEDIR}/" "${PKG_TARBALL}" } # Common setup code @@ -1300,6 +1300,7 @@ common_setup() { DOWNLOAD_DIR="${WORK_DIR}/download_cache" PKG_BASEDIR="${PLATFORM}_${DEPS_VERSION}" + PKG_TARBALL="${PKG_BASEDIR}.tar.xz" BUILD_BASEDIR="build-${PKG_BASEDIR}" BUILD_DIR="${WORK_DIR}/${BUILD_BASEDIR}" PREFIX="${BUILD_DIR}/prefix" From 1e2392b8489c66dd3e8ae21e8300bed3ea02d5fe Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Mon, 22 Jun 2026 18:44:49 +0200 Subject: [PATCH 2/2] external_deps: add download action to download and extract the external deps tarball like CMake --- external_deps/build.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/external_deps/build.sh b/external_deps/build.sh index e39f435786..ec6eedf84c 100755 --- a/external_deps/build.sh +++ b/external_deps/build.sh @@ -1291,6 +1291,31 @@ build_wipe() { rm -rf "${BUILD_BASEDIR}/" "${PKG_BASEDIR}/" "${PKG_TARBALL}" } +build_download() { + local upstreams=( + 'https://dl.unvanquished.net/deps' + 'https://dl.unvanquished.net/test/deps' + ) + + local mirrors=() + for upstream in "${upstreams[@]}" + do + mirrors+=("${upstream}/${PKG_TARBALL}") + done + + download "${PKG_TARBALL}" "${mirrors[@]}" + + "${download_only}" && return + + rm -rf "${PKG_BASEDIR}" + + extract "${PKG_TARBALL}" 'download_deps' + mv "${PKG_BASEDIR}" .. + + cd .. + rmdir 'download_deps' +} + # Common setup code common_setup() { HOST="${2}" @@ -1507,6 +1532,8 @@ printHelp() { install create a stripped down version of the built packages that CMake can use package create a tarball of the dependencies so they can be distributed wipe remove products of build process, excepting download cache but INCLUDING installed files. Must be last + download + download and extract the prebuilt tarball like CMake does Packages required for each platform: