From fcacfef8b1865526968a771838d4c3f70808c2e0 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 15:44:34 +0000 Subject: [PATCH] tzcode: updated to 2014e --- tzdata/.footprint | 35 ++++------ tzdata/.md5sum | 8 +-- tzdata/Pkgfile | 6 +- tzdata/tzcode-makefile.patch | 121 +++++++++++++++++++-------------- tzdata/zic_host-makefile.patch | 69 +++++++++++-------- 5 files changed, 130 insertions(+), 109 deletions(-) diff --git a/tzdata/.footprint b/tzdata/.footprint index f88b9a5..6acf58a 100644 --- a/tzdata/.footprint +++ b/tzdata/.footprint @@ -1,6 +1,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/tzselect +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libtz.a drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/newctime.3.gz @@ -247,6 +249,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Antarctica/ -rw-r--r-- root/root usr/share/zoneinfo/Antarctica/Rothera -rw-r--r-- root/root usr/share/zoneinfo/Antarctica/South_Pole -rw-r--r-- root/root usr/share/zoneinfo/Antarctica/Syowa +-rw-r--r-- root/root usr/share/zoneinfo/Antarctica/Troll -rw-r--r-- root/root usr/share/zoneinfo/Antarctica/Vostok drwxr-xr-x root/root usr/share/zoneinfo/Arctic/ -rw-r--r-- root/root usr/share/zoneinfo/Arctic/Longyearbyen @@ -294,6 +297,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/Asia/Kashgar -rw-r--r-- root/root usr/share/zoneinfo/Asia/Kathmandu -rw-r--r-- root/root usr/share/zoneinfo/Asia/Katmandu +-rw-r--r-- root/root usr/share/zoneinfo/Asia/Khandyga -rw-r--r-- root/root usr/share/zoneinfo/Asia/Kolkata -rw-r--r-- root/root usr/share/zoneinfo/Asia/Krasnoyarsk -rw-r--r-- root/root usr/share/zoneinfo/Asia/Kuala_Lumpur @@ -317,9 +321,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/Asia/Qyzylorda -rw-r--r-- root/root usr/share/zoneinfo/Asia/Rangoon -rw-r--r-- root/root usr/share/zoneinfo/Asia/Riyadh --rw-r--r-- root/root usr/share/zoneinfo/Asia/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/Asia/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/Asia/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/Asia/Saigon -rw-r--r-- root/root usr/share/zoneinfo/Asia/Sakhalin -rw-r--r-- root/root usr/share/zoneinfo/Asia/Samarkand @@ -338,6 +339,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/Asia/Ulaanbaatar -rw-r--r-- root/root usr/share/zoneinfo/Asia/Ulan_Bator -rw-r--r-- root/root usr/share/zoneinfo/Asia/Urumqi +-rw-r--r-- root/root usr/share/zoneinfo/Asia/Ust-Nera -rw-r--r-- root/root usr/share/zoneinfo/Asia/Vientiane -rw-r--r-- root/root usr/share/zoneinfo/Asia/Vladivostok -rw-r--r-- root/root usr/share/zoneinfo/Asia/Yakutsk @@ -453,6 +455,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Europe/ -rw-r--r-- root/root usr/share/zoneinfo/Europe/Brussels -rw-r--r-- root/root usr/share/zoneinfo/Europe/Bucharest -rw-r--r-- root/root usr/share/zoneinfo/Europe/Budapest +-rw-r--r-- root/root usr/share/zoneinfo/Europe/Busingen -rw-r--r-- root/root usr/share/zoneinfo/Europe/Chisinau -rw-r--r-- root/root usr/share/zoneinfo/Europe/Copenhagen -rw-r--r-- root/root usr/share/zoneinfo/Europe/Dublin @@ -537,10 +540,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/Mexico/ -rw-r--r-- root/root usr/share/zoneinfo/Mexico/BajaNorte -rw-r--r-- root/root usr/share/zoneinfo/Mexico/BajaSur -rw-r--r-- root/root usr/share/zoneinfo/Mexico/General -drwxr-xr-x root/root usr/share/zoneinfo/Mideast/ --rw-r--r-- root/root usr/share/zoneinfo/Mideast/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/Mideast/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/Mideast/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/NZ -rw-r--r-- root/root usr/share/zoneinfo/NZ-CHAT -rw-r--r-- root/root usr/share/zoneinfo/Navajo @@ -853,6 +852,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Antarctica/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Antarctica/Rothera -rw-r--r-- root/root usr/share/zoneinfo/posix/Antarctica/South_Pole -rw-r--r-- root/root usr/share/zoneinfo/posix/Antarctica/Syowa +-rw-r--r-- root/root usr/share/zoneinfo/posix/Antarctica/Troll -rw-r--r-- root/root usr/share/zoneinfo/posix/Antarctica/Vostok drwxr-xr-x root/root usr/share/zoneinfo/posix/Arctic/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Arctic/Longyearbyen @@ -900,6 +900,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Kashgar -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Kathmandu -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Katmandu +-rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Khandyga -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Kolkata -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Krasnoyarsk -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Kuala_Lumpur @@ -923,9 +924,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Qyzylorda -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Rangoon -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Riyadh --rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Saigon -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Sakhalin -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Samarkand @@ -944,6 +942,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Ulaanbaatar -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Ulan_Bator -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Urumqi +-rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Ust-Nera -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Vientiane -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Vladivostok -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Yakutsk @@ -1059,6 +1058,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Europe/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Brussels -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Bucharest -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Budapest +-rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Busingen -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Chisinau -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Copenhagen -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Dublin @@ -1143,10 +1143,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Mexico/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Mexico/BajaNorte -rw-r--r-- root/root usr/share/zoneinfo/posix/Mexico/BajaSur -rw-r--r-- root/root usr/share/zoneinfo/posix/Mexico/General -drwxr-xr-x root/root usr/share/zoneinfo/posix/Mideast/ --rw-r--r-- root/root usr/share/zoneinfo/posix/Mideast/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/posix/Mideast/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/posix/Mideast/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/posix/NZ -rw-r--r-- root/root usr/share/zoneinfo/posix/NZ-CHAT -rw-r--r-- root/root usr/share/zoneinfo/posix/Navajo @@ -1458,6 +1454,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Antarctica/ -rw-r--r-- root/root usr/share/zoneinfo/right/Antarctica/Rothera -rw-r--r-- root/root usr/share/zoneinfo/right/Antarctica/South_Pole -rw-r--r-- root/root usr/share/zoneinfo/right/Antarctica/Syowa +-rw-r--r-- root/root usr/share/zoneinfo/right/Antarctica/Troll -rw-r--r-- root/root usr/share/zoneinfo/right/Antarctica/Vostok drwxr-xr-x root/root usr/share/zoneinfo/right/Arctic/ -rw-r--r-- root/root usr/share/zoneinfo/right/Arctic/Longyearbyen @@ -1505,6 +1502,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Kashgar -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Kathmandu -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Katmandu +-rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Khandyga -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Kolkata -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Krasnoyarsk -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Kuala_Lumpur @@ -1528,9 +1526,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Qyzylorda -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Rangoon -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Riyadh --rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Saigon -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Sakhalin -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Samarkand @@ -1549,6 +1544,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Ulaanbaatar -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Ulan_Bator -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Urumqi +-rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Ust-Nera -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Vientiane -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Vladivostok -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Yakutsk @@ -1664,6 +1660,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Europe/ -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Brussels -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Bucharest -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Budapest +-rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Busingen -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Chisinau -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Copenhagen -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Dublin @@ -1748,10 +1745,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Mexico/ -rw-r--r-- root/root usr/share/zoneinfo/right/Mexico/BajaNorte -rw-r--r-- root/root usr/share/zoneinfo/right/Mexico/BajaSur -rw-r--r-- root/root usr/share/zoneinfo/right/Mexico/General -drwxr-xr-x root/root usr/share/zoneinfo/right/Mideast/ --rw-r--r-- root/root usr/share/zoneinfo/right/Mideast/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/right/Mideast/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/right/Mideast/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/right/NZ -rw-r--r-- root/root usr/share/zoneinfo/right/NZ-CHAT -rw-r--r-- root/root usr/share/zoneinfo/right/Navajo diff --git a/tzdata/.md5sum b/tzdata/.md5sum index f719d59..0e8a346 100644 --- a/tzdata/.md5sum +++ b/tzdata/.md5sum @@ -1,4 +1,4 @@ -051c7f462b3b9e3934572a5afd276d9a tzcode-makefile.patch -868b5d0dbf0e115ae4eb39a932ad0c4c tzcode2012j.tar.gz -ba2f92ae7ad099090e8f86cff2f2d799 tzdata2012j.tar.gz -0a1f00a575587eec635bbef60c62f6d9 zic_host-makefile.patch +cd1eb9bce381be0d6a35337f593aca18 tzcode-makefile.patch +552251600ee3571c244d33c7196ec2ed tzcode2014e.tar.gz +8a49fdedd4e832da8e85f7f9bcaedc33 tzdata2014e.tar.gz +551ff6a7cbf071846bf3b18114bb3ab4 zic_host-makefile.patch diff --git a/tzdata/Pkgfile b/tzdata/Pkgfile index 1fcb28d..5064d31 100644 --- a/tzdata/Pkgfile +++ b/tzdata/Pkgfile @@ -4,7 +4,7 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=tzdata -version=2012j +version=2014e release=1 source=(http://www.iana.org/time-zones/repository/releases/$name$version.tar.gz @@ -21,9 +21,5 @@ build() { patch -p0 -i $SRC/zic_host-makefile.patch make - - # fix error when directory exists - sed 's|mkdir |mkdir -p |g' -i Makefile - make DESTDIR=$PKG install } diff --git a/tzdata/tzcode-makefile.patch b/tzdata/tzcode-makefile.patch index 683184d..1c964c1 100644 --- a/tzdata/tzcode-makefile.patch +++ b/tzdata/tzcode-makefile.patch @@ -1,31 +1,43 @@ -# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch -# Patch reapplied and fixed for tzcode 2012i +# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/2013f-makefile.patch +# added some fixes for the file-layout (jue) +# +# - Support env CC +# - Don't build/install libtz.a +# - Don't install man-pages provided by man-pages +# - Move zic, zdump to sbin and tzselect to bin ala glibc +# - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc +# - Install leaps zoneinfo into zoneinfo/right/ ala glibc + diff -Nru tzcode.orig/Makefile tzcode/Makefile ---- tzcode.orig/Makefile 2012-11-04 10:31:01.772733264 +0100 -+++ tzcode/Makefile 2012-11-04 10:31:16.358872807 +0100 -@@ -39,17 +39,17 @@ +--- tzcode.orig/Makefile 2013-12-21 14:05:52.169527862 +0100 ++++ tzcode/Makefile 2013-12-21 14:06:05.299054045 +0100 +@@ -45,21 +45,21 @@ # Everything gets put in subdirectories of. . . -TOPDIR= /usr/local -+TOPDIR= $(DESTDIR)/usr ++TOPDIR= /usr # "Compiled" time zone information is placed in the "TZDIR" directory # (and subdirectories). # Use an absolute path name for TZDIR unless you're just testing the software. --TZDIR= $(TOPDIR)/etc/zoneinfo -+TZDIR= $(TOPDIR)/share/zoneinfo + TZDIR_BASENAME= zoneinfo +-TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) ++TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME) + + # Types to try, as an alternative to time_t. int64_t should be first. + TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t # The "tzselect", "zic", and "zdump" commands get installed in. . . -ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin ++SBINDIR= $(TOPDIR)/sbin # If you "make INSTALL", the "date" command gets installed in. . . -@@ -274,8 +274,10 @@ +@@ -290,8 +290,10 @@ ############################################################################### @@ -33,57 +45,66 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile -CC= $(cc) -DTZDIR=\"$(TZDIR)\" +CC+= -DTZDIR=\"$(TZDIR)\" +ifeq ($(NLS),1) -+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" ++CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" +endif - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c - TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -316,13 +318,15 @@ + AR= ar +@@ -341,19 +343,18 @@ ALL: all date --install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) -+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) + install: all $(DATA) $(REDO) $(MANS) +- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ +- $(DESTDIR)$(LIBDIR) \ ++ mkdir -p $(DESTDIR)$(SBINDIR) $(DESTDIR)$(TZDIR) \ ++ $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) \ + $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ + $(DESTDIR)$(MANDIR)/man8 $(ZIC) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -- -mkdir $(TOPDIR) $(ETCDIR) -- cp tzselect zic zdump $(ETCDIR)/. -+ -mkdir $(TOPDIR) $(SBINDIR) -+ cp zic zdump $(SBINDIR)/. -+ -mkdir $(TOPDIR) $(BINDIR) -+ cp tzselect $(BINDIR)/. - -mkdir $(TOPDIR) $(MANDIR) \ - $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 - -rm -f $(MANDIR)/man3/newctime.3 \ -@@ -332,8 +336,6 @@ - $(MANDIR)/man8/zdump.8 \ - $(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(MANDIR)/man3/. -- cp tzfile.5 $(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. + -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) + cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. +- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. ++ cp zic zdump $(DESTDIR)$(SBINDIR)/. ++ cp tzselect $(DESTDIR)$(BINDIR)/. + cp libtz.a $(DESTDIR)$(LIBDIR)/. + $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a + cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. +- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/. +- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. INSTALL: ALL install date.1 - -mkdir $(TOPDIR) $(BINDIR) -@@ -372,9 +374,9 @@ + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 +@@ -396,19 +397,17 @@ # You must replace all of $(TZDIR) to switch from not using leap seconds # to using them, or vice versa. - other_two: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) -+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) - $(ZIC) -y $(YEARISTYPE) \ -- -d $(TZDIR)-leaps -L leapseconds $(TDATA) -+ -d $(TZDIR)/right -L leapseconds $(TDATA) - - posix_right: posix_only other_two - -@@ -400,7 +402,7 @@ + right_posix: right_only leapseconds +- rm -fr $(DESTDIR)$(TZDIR)-leaps +- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \ +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ ++ rm -fr $(DESTDIR)$(TZDIR)/right ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) + + posix_right: posix_only leapseconds + rm -fr $(DESTDIR)$(TZDIR)-posix +- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \ +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) + + zones: $(REDO) +@@ -431,7 +430,7 @@ <$? >$@ chmod +x $@ --check: check_tables check_web -+check: check_tables +-check: check_character_set check_tables check_web ++check: check_character_set check_tables - check_tables: checktab.awk $(PRIMARY_YDATA) - $(AWK) -f checktab.awk $(PRIMARY_YDATA) + check_character_set: $(ENCHILADA) + sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA) diff --git a/tzdata/zic_host-makefile.patch b/tzdata/zic_host-makefile.patch index a3ae162..5772498 100644 --- a/tzdata/zic_host-makefile.patch +++ b/tzdata/zic_host-makefile.patch @@ -1,46 +1,57 @@ ---- Makefile.orig 2012-10-15 16:32:13.248683438 +0000 -+++ Makefile 2012-10-15 16:33:33.324686164 +0000 -@@ -219,8 +219,8 @@ - # If you want zic's -s option used when installing, uncomment the next line - # ZFLAGS= -s +--- Makefile.orig 2014-10-01 15:40:50.900427432 +0000 ++++ Makefile 2014-10-01 15:42:37.400428739 +0000 +@@ -231,8 +231,8 @@ + + LDFLAGS= $(LFLAGS) -zic= ./zic -ZIC= $(zic) $(ZFLAGS) +ZIC_HOST= ./zic_host +ZIC= $(ZIC_HOST) $(ZFLAGS) - # The name of a Posix-compliant `awk' on your system. - AWK= awk -@@ -301,7 +301,7 @@ - ALL: all date + ZFLAGS= - install: all $(DATA) $(REDO) $(MANS) $(TABDATA) +@@ -347,7 +347,7 @@ + $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) \ + $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ + $(DESTDIR)$(MANDIR)/man8 - $(ZIC) -y $(YEARISTYPE) \ + $(ZIC_HOST) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -@@ -341,10 +341,10 @@ - chmod +x yearistype + -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) + cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. + cp zic zdump $(DESTDIR)$(SBINDIR)/. +@@ -380,11 +380,11 @@ + $(AWK) -f leapseconds.awk leap-seconds.list >$@ posix_only: zic $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA) -+ $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ + -L /dev/null $(TDATA) right_only: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA) -+ $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ + -L leapseconds $(TDATA) # In earlier versions of this makefile, the other two directories were - # subdirectories of $(TZDIR). However, this led to configuration errors. -@@ -356,8 +356,8 @@ - # You must replace all of $(TZDIR) to switch from not using leap seconds +@@ -398,16 +398,16 @@ # to using them, or vice versa. - other_two: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) -- $(ZIC) -y $(YEARISTYPE) \ -+ $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) -+ $(ZIC_HOST) -y $(YEARISTYPE) \ - -d $(TZDIR)/right -L leapseconds $(TDATA) + right_posix: right_only leapseconds + rm -fr $(DESTDIR)$(TZDIR)/right +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) + + posix_right: posix_only leapseconds + rm -fr $(DESTDIR)$(TZDIR)-posix +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) - posix_right: posix_only other_two \ No newline at end of file + zones: $(REDO) -- 2.26.2