tar: updated to 1.30

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

diff --git a/tzdata/zic_host-makefile.patch b/tzdata/zic_host-makefile.patch
index 18698d17840463e4f16c494442187ba8eb2723ab..fab8b9cc64dd8f8ca56912ac5eb6a53c521a129a 100644 (file)
--- a/tzdata/zic_host-makefile.patch
+++ b/tzdata/zic_host-makefile.patch
@@ -1,63 +1,31 @@
---- Makefile.orig      2015-11-16 11:06:13.302320678 +0000
-+++ Makefile   2015-11-16 11:07:23.232321567 +0000
-@@ -236,8 +236,8 @@
+Binary files orig/.Makefile.un~ and new/.Makefile.un~ differ
+diff -pruN orig/Makefile new/Makefile
+--- orig/Makefile      2016-11-07 00:38:36.000000000 +0000
++++ new/Makefile       2017-02-15 18:46:50.541740747 +0000
+@@ -255,14 +255,14 @@ LEAPSECONDS=
  
- LDFLAGS=      $(LFLAGS)
+ # The zic command and its arguments.
  
 -zic=          ./zic
 -ZIC=          $(zic) $(ZFLAGS)
 +zic=          ./zic_host
-+ZIC_HOST=     $(zic) $(ZFLAGS)
++ZIC_HOST=             $(zic) $(ZFLAGS)
  
  ZFLAGS=
  
-@@ -377,7 +377,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 $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
-               cp zic zdump $(DESTDIR)$(SBINDIR)/.
-@@ -410,11 +410,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) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
++ZIC_INSTALL=  $(ZIC_HOST) -y $(YEARISTYPE) -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
+@@ -475,7 +475,7 @@ INSTALLARGS = \
+  PACKRATDATA='$(PACKRATDATA)' \
+  TZDIR=$(TZDIR) \
+  YEARISTYPE=$(YEARISTYPE) \
+- ZIC='$(ZIC)'
++ ZIC='$(ZIC_HOST)'
  
- # In earlier versions of this makefile, the other two directories were
-@@ -428,21 +428,21 @@
- # 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)
- 
- posix_packrat:        posix_only backzone
-               $(AWK) '/^Rule/' $(TDATA) | \
--                $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
-+                $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
-                       -L /dev/null - backzone
- 
- zones:                $(REDO)
+ # 'make install_data' installs one set of tz binary files.
+ # It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc.