diff options
| author | Luke Dashjr <[email protected]> | 2016-02-09 03:29:23 +0000 |
|---|---|---|
| committer | Patrick Lodder <[email protected]> | 2016-12-11 18:30:14 +0100 |
| commit | 1adeca4dad222626fb49dc20646f01660d3a7888 (patch) | |
| tree | e8e35e19cbb560f0e3f90308ce137465f1fe3a3a | |
| parent | [depends] fix samba.org url for ccache as there is a redirect chain (diff) | |
| download | discoin-1adeca4dad222626fb49dc20646f01660d3a7888.tar.xz discoin-1adeca4dad222626fb49dc20646f01660d3a7888.zip | |
[depends] Use curl for fetching dependencies
Cherry-picked & Rebased-From: c01f08d 5d1148c 1ecbb3b
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | depends/builders/darwin.mk | 2 | ||||
| -rw-r--r-- | depends/builders/linux.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 0c4086830..b35bee642 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,7 +89,7 @@ before_script: - unset CC; unset CXX - mkdir -p depends/SDKs depends/sdk-sources - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/install-deps.sh; fi - - if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then wget $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -O depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi + - if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi - make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS script: diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk index b366460e6..cedbddc57 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 --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o +build_darwin_DOWNLOAD = curl --location --fail --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 98d0e9de3..d6a304e4b 100644 --- a/depends/builders/linux.mk +++ b/depends/builders/linux.mk @@ -1,2 +1,2 @@ build_linux_SHA256SUM = sha256sum -build_linux_DOWNLOAD = wget --timeout=$(DOWNLOAD_CONNECT_TIMEOUT) --tries=$(DOWNLOAD_RETRIES) -nv -O +build_linux_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o |