From 3a9152a3186d14f29f1cec1b86d0a6f2a69f5f6d Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 3 Mar 2020 11:35:25 +0000 Subject: [PATCH] Use local mirror of source archive which Qt deleted in build script --- util/buildscripts/scripts/compile_linux.sh | 2 +- util/buildscripts/scripts/docker/prepare.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/util/buildscripts/scripts/compile_linux.sh b/util/buildscripts/scripts/compile_linux.sh index 158ab5e61..ea4f67dd1 100755 --- a/util/buildscripts/scripts/compile_linux.sh +++ b/util/buildscripts/scripts/compile_linux.sh @@ -4,7 +4,7 @@ echo "Building renderdoc-build docker image" # Ensure the docker image is prepared pushd "${BUILD_ROOT}"/scripts/docker -docker build -t renderdoc-build . +docker build -t renderdoc-build . || exit 1 popd echo "Docker image built. Running build" diff --git a/util/buildscripts/scripts/docker/prepare.sh b/util/buildscripts/scripts/docker/prepare.sh index f17375ff8..d04562694 100755 --- a/util/buildscripts/scripts/docker/prepare.sh +++ b/util/buildscripts/scripts/docker/prepare.sh @@ -64,7 +64,15 @@ cd .. apt-get install --force-yes -y libfontconfig1-dev # build qt for static linking -wget http://download.qt.io/archive/qt/5.6/5.6.2/single/qt-everywhere-opensource-src-5.6.2.tar.xz +# +# Qt deleted the archive from their official mirrors (wtf?) +# It is rehosted on renderdoc.org and the md5 is verified against the official md5: +# https://web.archive.org/web/20161212004141/https://download.qt.io/archive/qt/5.6/5.6.2/single/md5sums.txt +#wget http://download.qt.io/archive/qt/5.6/5.6.2/single/qt-everywhere-opensource-src-5.6.2.tar.xz + +wget https://renderdoc.org/qt-everywhere-opensource-src-5.6.2.tar.xz +echo "5175fba2f221fd4c91e94771a57a5557 qt-everywhere-opensource-src-5.6.2.tar.xz" | md5sum -c - + tar -xf qt-everywhere-opensource-src-5.6.2.tar.xz cd qt-everywhere-opensource-src-5.6.2