diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-01-29 23:51:12 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-01-29 23:51:54 +0100 |
| commit | 64242f6f2b4b80b8756e2dffc8ad302b7bcaf5ae (patch) | |
| tree | c816f70475cce1e6507f29f887ea00cdcc4f8998 /mk | |
| parent | ad4070ddf6dac745fce434a8afbb4c44d2e0915f (diff) | |
| download | embtoolkit-64242f6f2b4b80b8756e2dffc8ad302b7bcaf5ae.tar.gz embtoolkit-64242f6f2b4b80b8756e2dffc8ad302b7bcaf5ae.tar.bz2 embtoolkit-64242f6f2b4b80b8756e2dffc8ad302b7bcaf5ae.tar.xz | |
Build system: improve download of packages tarball
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/macros.packages.mk | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index c3de108..028c5e5 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -112,6 +112,7 @@ __embtk_pkg_patch_site = $(strip $(if $($(PKGV)_PATCH_SITE), \ $($(PKGV)_PATCH_SITE), \ $(__embtk_patch_site)/$(__embtk_pkg_name)/$(__embtk_pkg_version))) __embtk_pkg_patch_f = $(strip $(DOWNLOAD_DIR))/$(__embtk_pkg_name)-$(__embtk_pkg_version).patch +__embtk_pkg_mirror = $(__embtk_patch_site)/packages-mirror __embtk_pkg_mirror1 = $(strip $($(PKGV)_MIRROR1)) __embtk_pkg_mirror2 = $(strip $($(PKGV)_MIRROR2)) __embtk_pkg_mirror3 = $(strip $($(PKGV)_MIRROR3)) @@ -497,16 +498,6 @@ if [ "x$(__embtk_pkg_needpatch)" = "xy" ]; then \ $(__embtk_pkg_name)-$(__embtk_pkg_version)-*.patch); \ fi endef -define __embtk_download_pkg_from_mirror -if [ "x$($(PKGV)_SITE_MIRROR$(2))" = "x" ]; then \ - false; \ -else \ - $(call embtk_wget, \ - $(__embtk_pkg_package), \ - $($(PKGV)_SITE_MIRROR$(2)), \ - $(__embtk_pkg_package)); \ -fi -endef define __embtk_download_pkg_exitfailure (echo -e "\E[1;31m!Error on $(notdir $(1)) download!\E[0m";rm -rf $(1); \ @@ -559,9 +550,26 @@ define __embtk_download_pkg_from_tarball $(__embtk_pkg_package), \ $(__embtk_pkg_site), \ $(__embtk_pkg_package)) || \ - $(call __embtk_download_pkg_from_mirror,$(1),1) || \ - $(call __embtk_download_pkg_from_mirror,$(1),2) || \ - $(call __embtk_download_pkg_from_mirror,$(1),3) || \ + $(if $(__embtk_pkg_mirror1), \ + $(call embtk_wget, \ + $(__embtk_pkg_package), \ + $(__embtk_pkg_mirror1), \ + $(__embtk_pkg_package)),false) || \ + $(if $(__embtk_pkg_mirror2), \ + $(call embtk_wget, \ + $(__embtk_pkg_package), \ + $(__embtk_pkg_mirror2), \ + $(__embtk_pkg_package)),false) || \ + $(if $(__embtk_pkg_mirror3), \ + $(call embtk_wget, \ + $(__embtk_pkg_package), \ + $(__embtk_pkg_mirror3), \ + $(__embtk_pkg_package)),false) || \ + $(if $(__embtk_pkg_mirror), \ + $(call embtk_wget, \ + $(__embtk_pkg_package), \ + $(__embtk_pkg_mirror), \ + $(__embtk_pkg_package)),false) || \ $(call __embtk_download_pkg_exitfailure,$(__embtk_pkg_package_f)) $(call __embtk_download_pkg_patches,$(1)) || \ $(call __embtk_download_pkg_exitfailure,$(__embtk_pkg_patch_f)) |