From 89a05e6fbb7327f8f1386f7a3e316a346e06c026 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 20 Apr 2018 09:38:37 +0000 Subject: [PATCH] Improve downloads for 3rd party sources. * Set a max time of 2 minutes on curl downloads. In case of a broken mirror, there is no need to wait more than that. * Let sourceforge decide which mirror to use for recoil, so if one goes down, we don't have to change manually. --- 3rdparty/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/3rdparty/Makefile b/3rdparty/Makefile index d003f434..7ecea103 100644 --- a/3rdparty/Makefile +++ b/3rdparty/Makefile @@ -31,15 +31,14 @@ LUAURL=https://www.lua.org/ftp/$(LUAARCH) RECOILVER=4.2.0 RECOIL=recoil-$(RECOILVER) RECOILARCH=$(RECOIL).tar.gz -#RECOILURL=https://downloads.sourceforge.net/project/recoil/recoil/$(RECOILVER)/$(RECOILARCH) -RECOILURL=https://excellmedia.dl.sourceforge.net/project/recoil/recoil/$(RECOILVER)/$(RECOILARCH) +RECOILURL=https://sourceforge.net/projects/recoil/files/recoil/$(RECOILVER)/$(RECOILARCH) PREFIX = $(PWD)/usr MKDIR = mkdir -p CP = cp -v TAR = $(shell which tar) -GETURL = $(shell WGET=`which wget` ; if [ "$?" = "0" ] && [ -x "$WGET" ] ; then echo "$WGET" ; else echo "curl -O -L" ; fi ) +GETURL = $(shell WGET=`which wget` ; if [ "$?" = "0" ] && [ -x "$WGET" ] ; then echo "$WGET" ; else echo "curl -O -L --max-time 120" ; fi ) BUILD_CC := $(CC)