tzdata: updated to 2018d

[crossrootfs.git] / tzdata / zic_host-makefile.patch

diff --git a/tzdata/zic_host-makefile.patch b/tzdata/zic_host-makefile.patch
index 5772498c9d026747ac14a64e76cf8025e25f1779..f18fcf2260a821d56f9c0cb959158dd30f5b7258 100644 (file)
--- a/tzdata/zic_host-makefile.patch
+++ b/tzdata/zic_host-makefile.patch
@@ -1,57 +1,29 @@
---- Makefile.orig      2014-10-01 15:40:50.900427432 +0000
-+++ Makefile   2014-10-01 15:42:37.400428739 +0000
-@@ -231,8 +231,8 @@
+--- src.orig/Makefile  2018-05-09 22:44:57.787104123 +0000
++++ src/Makefile       2018-05-09 22:47:08.227103096 +0000
+@@ -350,14 +350,14 @@
  
- LDFLAGS=      $(LFLAGS)
+ # The zic command and its arguments.
  
 -zic=          ./zic
 -ZIC=          $(zic) $(ZFLAGS)
-+ZIC_HOST=             ./zic_host
-+ZIC=          $(ZIC_HOST) $(ZFLAGS)
++zic=          ./zic_host
++ZIC_HOST=             $(zic) $(ZFLAGS)
  
  ZFLAGS=
  
-@@ -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 $(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 >$@
+ # How to use zic to install tz binary files.
  
- posix_only:   zic $(TDATA)
--              $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
-+              $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
-                       -L /dev/null $(TDATA)
+-ZIC_INSTALL=  $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
++ZIC_INSTALL=  $(ZIC_HOST) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
  
- right_only:   zic leapseconds $(TDATA)
--              $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
-+              $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
-                       -L leapseconds $(TDATA)
+ # The name of a Posix-compliant 'awk' on your system.
+ AWK=          awk
+@@ -600,7 +600,7 @@
+  TZDEFAULT='$(TZDEFAULT)' \
+  TZDIR='$(TZDIR)' \
+  YEARISTYPE='$(YEARISTYPE)' \
+- ZIC='$(ZIC)'
++ ZIC='$(ZIC_HOST)'
  
- # In earlier versions of this makefile, the other two directories were
-@@ -398,16 +398,16 @@
- # to using them, or vice versa.
- 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)
- 
- zones:                $(REDO)
+ # 'make install_data' installs one set of tz binary files.
+ install_data: zic leapseconds yearistype tzdata.zi