diff options
-rw-r--r-- | core/mk/pkg-macros/sites.mk | 3 | ||||
-rw-r--r-- | packages/compression/zlib/zlib.mk | 2 | ||||
-rw-r--r-- | packages/htools/zlib/zlib.mk | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/core/mk/pkg-macros/sites.mk b/core/mk/pkg-macros/sites.mk index d4e893f..66a30cd 100644 --- a/core/mk/pkg-macros/sites.mk +++ b/core/mk/pkg-macros/sites.mk @@ -28,4 +28,5 @@ embtk_sites_sf_mirrors += tenet embtk_sites_sf_mirrors += ufpr embtk_sites_sf_mirrors += waix -embtk_sites_sf := $(foreach m,$(embtk_sites_sf_mirrors),http://${m}.dl.sourceforge.net/project) +embtk_sites_sf := $(foreach m,$(embtk_sites_sf_mirrors),http://${m}.dl.sourceforge.net/project) +embtk_sites_sf_subdir = $(addsuffix /$(1),$(embtk_sites_sf)) diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk index 1b35cf8..aa6c3ef 100644 --- a/packages/compression/zlib/zlib.mk +++ b/packages/compression/zlib/zlib.mk @@ -26,7 +26,7 @@ ZLIB_NAME := zlib ZLIB_VERSION := $(call embtk_get_pkgversion,zlib) ZLIB_SITE := http://zlib.net -ZLIB_MIRRORS := $(addsuffix /libpng/zlib/$(ZLIB_VERSION),$(embtk_sites_sf)) +ZLIB_MIRRORS := $(call embtk_sites_sf_subdir,libpng/zlib/$(ZLIB_VERSION)) ZLIB_PACKAGE := zlib-$(ZLIB_VERSION).tar.xz ZLIB_SRC_DIR := $(embtk_pkgb)/zlib-$(ZLIB_VERSION) ZLIB_BUILD_DIR := $(embtk_pkgb)/zlib-$(ZLIB_VERSION) diff --git a/packages/htools/zlib/zlib.mk b/packages/htools/zlib/zlib.mk index ac43d7d..a6097bf 100644 --- a/packages/htools/zlib/zlib.mk +++ b/packages/htools/zlib/zlib.mk @@ -25,8 +25,8 @@ ZLIB_HOST_NAME := zlib ZLIB_HOST_VERSION := $(call embtk_pkg_version,zlib_host) -ZLIB_HOST_SITE := http://zlib.net -ZLIB_HOST_MIRRORS := $(addsuffix /libpng/zlib/$(ZLIB_HOST_VERSION),$(embtk_sites_sf)) +ZLIB_HOST_SITE := http://zlib.netf +ZLIB_HOST_MIRRORS := $(call embtk_sites_sf_subdir,libpng/zlib/$(ZLIB_HOST_VERSION)) ZLIB_HOST_PACKAGE := zlib-$(ZLIB_HOST_VERSION).tar.xz ZLIB_HOST_SRC_DIR := $(embtk_toolsb)/zlib-$(ZLIB_HOST_VERSION) ZLIB_HOST_BUILD_DIR := $(embtk_toolsb)/zlib-$(ZLIB_HOST_VERSION) |