diff --git a/depends/Makefile b/depends/Makefile index 66c10db947aff..19f3c52e34762 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -8,6 +8,7 @@ NO_QT ?= NO_WALLET ?= NO_UPNP ?= FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources +FALLBACK_DOWNLOAD_PATH_ION ?= https://github.com/ioncoincore/ion-depends/releases/download/latest BUILD = $(shell ./config.guess) HOST ?= $(BUILD) diff --git a/depends/README.md b/depends/README.md index dd65f091802cd..f12c59659a926 100644 --- a/depends/README.md +++ b/depends/README.md @@ -68,6 +68,7 @@ The following can be set when running make: make FOO=bar SOURCES_PATH: downloaded sources will be placed here BASE_CACHE: built packages will be placed here SDK_PATH: Path where sdk's can be found (used by macOS) + FALLBACK_DOWNLOAD_PATH_ION: If a source file can't be fetched, try first from our alternative github sources FALLBACK_DOWNLOAD_PATH: If a source file can't be fetched, try here before giving up NO_QT: Don't download/build/cache qt and its dependencies NO_WALLET: Don't download/build/cache libs needed to enable the wallet diff --git a/depends/funcs.mk b/depends/funcs.mk index 15e404e42dcf3..bae113e5294cc 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -31,6 +31,7 @@ endef define fetch_file ( test -f $$($(1)_source_dir)/$(4) || \ ( $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)) || \ + $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH_ION),$(3),$(4),$(5)) || \ $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5)))) endef diff --git a/depends/packages/dbus.mk b/depends/packages/dbus.mk index 848263478a548..bbe03754099f5 100644 --- a/depends/packages/dbus.mk +++ b/depends/packages/dbus.mk @@ -1,6 +1,6 @@ package=dbus $(package)_version=1.10.18 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.10.18/ +$(package)_download_path=https://dbus.freedesktop.org/releases/dbus $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=6049ddd5f3f3e2618f615f1faeda0a115104423a7996b7aa73e2f36e38cc514a $(package)_dependencies=expat diff --git a/depends/packages/fontconfig.mk b/depends/packages/fontconfig.mk index 0852de22697dc..12695db4b9f78 100644 --- a/depends/packages/fontconfig.mk +++ b/depends/packages/fontconfig.mk @@ -1,6 +1,6 @@ package=fontconfig $(package)_version=2.12.1 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v2.12.1/ +$(package)_download_path=http://www.freedesktop.org/software/fontconfig/release/ $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 $(package)_dependencies=freetype expat diff --git a/depends/packages/gmp.mk b/depends/packages/gmp.mk index 4fa056e16dc81..2eea35d847e76 100644 --- a/depends/packages/gmp.mk +++ b/depends/packages/gmp.mk @@ -1,6 +1,6 @@ package=gmp $(package)_version=6.1.2 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v6.1.2/ +$(package)_download_path=https://github.com/cevap/gmplib/releases/download/v$($(package)_version)/ $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2 diff --git a/depends/packages/libX11.mk b/depends/packages/libX11.mk index 43aac69d2506b..298616bea42ac 100644 --- a/depends/packages/libX11.mk +++ b/depends/packages/libX11.mk @@ -1,6 +1,6 @@ package=libX11 $(package)_version=1.6.2 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.6.2/ +$(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/ $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16 $(package)_dependencies=libxcb xtrans xextproto xproto diff --git a/depends/packages/libXau.mk b/depends/packages/libXau.mk index 25230b7caebdc..304494e3c5e4c 100644 --- a/depends/packages/libXau.mk +++ b/depends/packages/libXau.mk @@ -1,6 +1,6 @@ package=libXau $(package)_version=1.0.8 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.0.8/ +$(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/ $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2 $(package)_dependencies=xproto diff --git a/depends/packages/libXext.mk b/depends/packages/libXext.mk index a34c1546fd2a6..c0565dd6720f9 100644 --- a/depends/packages/libXext.mk +++ b/depends/packages/libXext.mk @@ -1,6 +1,6 @@ package=libXext $(package)_version=1.3.2 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.3.2/ +$(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/ $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0 $(package)_dependencies=xproto xextproto libX11 libXau diff --git a/depends/packages/libxcb.mk b/depends/packages/libxcb.mk index f16f1d4fa9690..3f346d9728eba 100644 --- a/depends/packages/libxcb.mk +++ b/depends/packages/libxcb.mk @@ -1,6 +1,6 @@ package=libxcb $(package)_version=1.10 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.10-libxcb/ +$(package)_download_path=http://xcb.freedesktop.org/dist $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5 $(package)_dependencies=xcb_proto libXau xproto diff --git a/depends/packages/xcb_proto.mk b/depends/packages/xcb_proto.mk index 45f8c99ea7b88..0c7c958d62d42 100644 --- a/depends/packages/xcb_proto.mk +++ b/depends/packages/xcb_proto.mk @@ -1,6 +1,6 @@ package=xcb_proto $(package)_version=1.10 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.10/ +$(package)_download_path=http://xcb.freedesktop.org/dist $(package)_file_name=xcb-proto-$($(package)_version).tar.bz2 $(package)_sha256_hash=7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05 diff --git a/depends/packages/xextproto.mk b/depends/packages/xextproto.mk index aa515b6197f74..7065237bd562b 100644 --- a/depends/packages/xextproto.mk +++ b/depends/packages/xextproto.mk @@ -1,6 +1,6 @@ package=xextproto $(package)_version=7.3.0 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v7.3.0/ +$(package)_download_path=http://xorg.freedesktop.org/releases/individual/proto $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0 diff --git a/depends/packages/xproto.mk b/depends/packages/xproto.mk index 9a88eeae93c52..5328ec84819d1 100644 --- a/depends/packages/xproto.mk +++ b/depends/packages/xproto.mk @@ -1,6 +1,6 @@ package=xproto $(package)_version=7.0.26 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v7.0.26/ +$(package)_download_path=http://xorg.freedesktop.org/releases/individual/proto $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=636162c1759805a5a0114a369dffdeccb8af8c859ef6e1445f26a4e6e046514f diff --git a/depends/packages/xtrans.mk b/depends/packages/xtrans.mk index 185244e670cb1..c313b1f609b0b 100644 --- a/depends/packages/xtrans.mk +++ b/depends/packages/xtrans.mk @@ -1,6 +1,6 @@ package=xtrans $(package)_version=1.3.4 -$(package)_download_path=https://github.com/ioncoincore/ion-depends/releases/download/v1.3.4/ +$(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/ $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a $(package)_dependencies=