diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-08-27 03:40:30 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-08-27 03:40:30 -0400 |
| commit | df7565d99c4baca212db6bf1d75b097a7ec58475 (patch) | |
| tree | 269b569dbfa99c4335513f51eea9995d98341a5b /depends | |
| parent | c897b1e732f524e525d1bd150326b7f0632c1b69 (diff) | |
depends: add sensible download timeout/retry values
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/Makefile | 2 | ||||
| -rw-r--r-- | depends/builders/darwin.mk | 2 | ||||
| -rw-r--r-- | depends/builders/linux.mk | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/depends/Makefile b/depends/Makefile index 8075c66b78..f5fb5b865f 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -13,6 +13,8 @@ HOST ?= $(BUILD) PATCHES_PATH = $(BASEDIR)/patches BASEDIR = $(CURDIR) HASH_LENGTH:=11 +DOWNLOAD_CONNECT_TIMEOUT:=10 +DOWNLOAD_RETRIES:=3 host:=$(BUILD) ifneq ($(HOST),) diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk index 6b734648f0..b366460e64 100644 --- a/depends/builders/darwin.mk +++ b/depends/builders/darwin.mk @@ -7,7 +7,7 @@ build_darwin_OTOOL: = $(shell xcrun -f otool) build_darwin_NM: = $(shell xcrun -f nm) build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool) build_darwin_SHA256SUM = shasum -a 256 -build_darwin_DOWNLOAD = curl -L -o +build_darwin_DOWNLOAD = curl --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o #darwin host on darwin builder. overrides darwin host preferences. darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) diff --git a/depends/builders/linux.mk b/depends/builders/linux.mk index d98ba597dc..98d0e9de34 100644 --- a/depends/builders/linux.mk +++ b/depends/builders/linux.mk @@ -1,2 +1,2 @@ build_linux_SHA256SUM = sha256sum -build_linux_DOWNLOAD = wget -nv -O +build_linux_DOWNLOAD = wget --timeout=$(DOWNLOAD_CONNECT_TIMEOUT) --tries=$(DOWNLOAD_RETRIES) -nv -O |