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
This commit is contained in:
Tony Theodore 2017-11-13 07:59:28 +11:00
parent ba358185fa
commit b82080ec4d
1 changed files with 4 additions and 4 deletions

View File

@ -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)) \