diff --git a/make/host-tools.mk b/make/host-tools.mk index 4eeed65c..4b9e9b2d 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -142,7 +142,7 @@ HOST_TZDATA_URL = ftp://ftp.iana.org/tz/releases #$(ARCHIVE)/$(HOST_TZDATA_SOURCE): # $(DOWNLOAD) $(HOST_TZDATA_URL)/$(HOST_TZDATA_SOURCE) -HOST_TZCODE_VER = 2018e +HOST_TZCODE_VER = 2019b HOST_TZCODE_TMP = tzcode$(HOST_TZCODE_VER) HOST_TZCODE_SOURCE = tzcode$(HOST_TZCODE_VER).tar.gz HOST_TZCODE_URL = ftp://ftp.iana.org/tz/releases @@ -150,8 +150,10 @@ HOST_TZCODE_URL = ftp://ftp.iana.org/tz/releases $(ARCHIVE)/$(HOST_TZCODE_SOURCE): $(DOWNLOAD) $(HOST_TZCODE_URL)/$(HOST_TZCODE_SOURCE) -host-zic: $(HOST_DIR)/bin/zic -$(HOST_DIR)/bin/zic: $(ARCHIVE)/$(HOST_TZDATA_SOURCE) $(ARCHIVE)/$(HOST_TZCODE_SOURCE) | $(HOST_DIR)/bin +HOST_ZIC = $(HOST_DIR)/bin/zic + +host-zic: $(HOST_ZIC) +$(HOST_ZIC): $(ARCHIVE)/$(HOST_TZDATA_SOURCE) $(ARCHIVE)/$(HOST_TZCODE_SOURCE) | $(HOST_DIR)/bin $(REMOVE)/$(HOST_TZCODE_TMP) $(MKDIR)/$(HOST_TZCODE_TMP) $(CHDIR)/$(HOST_TZCODE_TMP); \ diff --git a/make/target-tools.mk b/make/target-tools.mk index 703f7159..05fc96c6 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -131,7 +131,7 @@ $(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/$(OPENSSH_SOURCE) | $(TARGET_DIR # ----------------------------------------------------------------------------- -TZDATA_VER = 2018e +TZDATA_VER = 2019b TZDATA_TMP = tzdata$(TZDATA_VER) TZDATA_SOURCE = tzdata$(TZDATA_VER).tar.gz TZDATA_URL = ftp://ftp.iana.org/tz/releases @@ -149,13 +149,13 @@ else LOCALTIME = etc/localtime endif -$(D)/tzdata: $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR) +$(D)/tzdata: $(HOST_ZIC) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(TZDATA_TMP) $(MKDIR)/$(TZDATA_TMP) $(CHDIR)/$(TZDATA_TMP); \ tar -xf $(ARCHIVE)/$(TZDATA_SOURCE); \ unset ${!LC_*}; LANG=POSIX; LC_ALL=POSIX; export LANG LC_ALL; \ - zic -d zoneinfo.tmp $(TZDATA_ZONELIST); \ + $(HOST_ZIC) -d zoneinfo.tmp $(TZDATA_ZONELIST); \ mkdir zoneinfo; \ sed -n '/zone=/{s/.*zone="\(.*\)".*$$/\1/; p}' $(IMAGEFILES)/tzdata/timezone.xml | sort -u | \ while read x; do \