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 a3ae1625d2d22798f09831df2cdbfc8d16d12d72..fab8b9cc64dd8f8ca56912ac5eb6a53c521a129a 100644 (file)
--- a/tzdata/zic_host-makefile.patch
+++ b/tzdata/zic_host-makefile.patch
@@ -1,46 +1,31 @@
---- 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
+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=
+ 
+ # The zic command and its arguments.
  
 -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
++zic=          ./zic_host
++ZIC_HOST=             $(zic) $(ZFLAGS)
  
- install:      all $(DATA) $(REDO) $(MANS) $(TABDATA)
--              $(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
+ ZFLAGS=
  
- posix_only:   zic $(TDATA)
--              $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA)
-+              $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA)
+ # How to use zic to install tz binary files.
  
- right_only:   zic leapseconds $(TDATA)
--              $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA)
-+              $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA)
+-ZIC_INSTALL=  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
++ZIC_INSTALL=  $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
  
- # 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
- # 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)
+ # 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)'
  
- posix_right:  posix_only other_two
\ No newline at end of file
+ # 'make install_data' installs one set of tz binary files.
+ # It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc.