diff --git a/package/zic/patches/0001-remove-dependency-check-on-version-file.patch b/package/zic/patches/0001-remove-dependency-check-on-version-file.patch index 193c2630..93626f79 100644 --- a/package/zic/patches/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/patches/0001-remove-dependency-check-on-version-file.patch @@ -18,7 +18,7 @@ diff --git a/Makefile b/Makefile index 1b714a8..00d2c09 100644 --- a/Makefile +++ b/Makefile -@@ -587,7 +587,7 @@ INSTALL: ALL install date.1 +@@ -596,7 +596,7 @@ INSTALL: ALL install date.1 # Otherwise, use $(VERSION) unless it is "unknown" and there is already # a 'version' file, in which case reuse the existing 'version' contents # and append "-dirty" if the contents do not already end in "-dirty". diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 685fde12..14af4d56 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,24 +4,25 @@ # ################################################################################ -HOST_ZIC_VERSION = 2020f +HOST_ZIC_VERSION = 2022a HOST_ZIC_DIR = tzcode$(HOST_ZIC_VERSION) HOST_ZIC_SOURCE = tzcode$(HOST_ZIC_VERSION).tar.gz -HOST_ZIC_SITE = ftp://ftp.iana.org/tz/releases - -$(DL_DIR)/$(HOST_ZIC_SOURCE): - $(download) $(HOST_ZIC_SITE)/$(HOST_ZIC_SOURCE) +HOST_ZIC_SITE = https://data.iana.org/time-zones/releases HOST_ZIC = $(HOST_DIR)/sbin/zic -host-zic: $(DL_DIR)/$(HOST_ZIC_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(PKG_DIR) - $(MKDIR)/$(PKG_DIR) - $(CHDIR)/$(PKG_DIR); \ - tar -xf $(DL_DIR)/$(PKG_SOURCE) +define HOST_ZIC_INSTALL_BINARY + $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/zic $(HOST_ZIC) +endef +HOST_ZIC_PRE_FOLLOWUP_HOOKS += HOST_ZIC_INSTALL_BINARY + +host-zic: | $(HOST_DIR) + $(call STARTUP) + $(call DEPENDENCIES) + $(call DOWNLOAD,$($(PKG)_SOURCE)) + $(MKDIR)/$($(PKG)_DIR) + $(call EXTRACT,$(PKG_BUILD_DIR)) $(call APPLY_PATCHES,$(PKG_PATCHES_DIR)) - $(CHDIR)/$(PKG_DIR); \ + $(CHDIR)/$($(PKG)_DIR); \ $(MAKE) zic - $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/zic $(HOST_ZIC) - $(REMOVE)/$(PKG_DIR) - $(TOUCH) + $(call HOST_FOLLOWUP)