summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-11-12 20:59:28 (GMT)
committerTony Theodore <tonyt@logyst.com>2017-11-12 20:59:36 (GMT)
commitb82080ec4d304e096d7bbd6a023838ac691d2b87 (patch)
treecdedb101733f24b844be1dceee85863e14455475 /Makefile
parentba358185fa71930403a55c00262bec7d82c4fc37 (diff)
downloadmxe-b82080ec4d304e096d7bbd6a023838ac691d2b87.zip
mxe-b82080ec4d304e096d7bbd6a023838ac691d2b87.tar.gz
mxe-b82080ec4d304e096d7bbd6a023838ac691d2b87.tar.bz2
Makefile: switch GitLab to https and reorder backup servers
See: https://github.com/mxe/mxe/pull/1899#issuecomment-343731128 - GitLab redirects to https anyway - final fallthrough to Cloudfront will be http - GitLab is (currently) the most complete so try it first
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 39930c0..9d7eef2 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ DEFAULT_MAX_JOBS := 6
SOURCEFORGE_MIRROR := downloads.sourceforge.net
PKG_MIRROR := https://s3.amazonaws.com/mxe-pkg
PKG_CDN := http://d1yihgixbnrglp.cloudfront.net
-GITLAB_BACKUP := http://gitlab.com/starius/mxe-backup2/raw/master
+GITLAB_BACKUP := https://gitlab.com/starius/mxe-backup2/raw/master
PWD := $(shell pwd)
SHELL := bash
@@ -271,9 +271,9 @@ ESCAPE_PKG = \
BACKUP_DOWNLOAD = \
(echo "MXE Warning! Downloading $(1) from backup." >&2 && \
- ($(WGET) -O '$(TMP_FILE)' $(PKG_MIRROR)/`$(call ESCAPE_PKG,$(1))`_$($(1)_CHECKSUM) || \
- $(WGET) -O '$(TMP_FILE)' $(PKG_CDN)/`$(call ESCAPE_PKG,$(1))`_$($(1)_CHECKSUM) || \
- $(WGET) -O '$(TMP_FILE)' $(GITLAB_BACKUP)/`$(call ESCAPE_PKG,$(1))`_$($(1)_CHECKSUM)))
+ ($(WGET) -O '$(TMP_FILE)' $(GITLAB_BACKUP)/`$(call ESCAPE_PKG,$(1))`_$($(1)_CHECKSUM) || \
+ $(WGET) -O '$(TMP_FILE)' $(PKG_MIRROR)/`$(call ESCAPE_PKG,$(1))`_$($(1)_CHECKSUM) || \
+ $(WGET) -O '$(TMP_FILE)' $(PKG_CDN)/`$(call ESCAPE_PKG,$(1))`_$($(1)_CHECKSUM)))
DOWNLOAD_PKG_ARCHIVE = \
$(eval TMP_FILE := $(PKG_DIR)/.tmp-$($(1)_FILE)) \