X-Git-Url: http://gitweb/?a=blobdiff_plain;f=tzdata%2Fzic_host-makefile.patch;h=f18fcf2260a821d56f9c0cb959158dd30f5b7258;hb=b75588478335dd0f6a0069b25165ac20feb98df0;hp=fab8b9cc64dd8f8ca56912ac5eb6a53c521a129a;hpb=335daabe43976d5298a875e5a6c8a5e15df86aa8;p=crossrootfs.git

diff --git a/tzdata/zic_host-makefile.patch b/tzdata/zic_host-makefile.patch
index fab8b9c..f18fcf2 100644
--- a/tzdata/zic_host-makefile.patch
+++ b/tzdata/zic_host-makefile.patch
@@ -1,8 +1,6 @@
-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=
+--- 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 @@
  
  # The zic command and its arguments.
  
@@ -15,17 +13,17 @@ diff -pruN orig/Makefile new/Makefile
  
  # How to use zic to install tz binary files.
  
--ZIC_INSTALL=	$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
-+ZIC_INSTALL=	$(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
+-ZIC_INSTALL=	$(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
++ZIC_INSTALL=	$(ZIC_HOST) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
  
  # The name of a Posix-compliant 'awk' on your system.
  AWK=		awk
-@@ -475,7 +475,7 @@ INSTALLARGS = \
-  PACKRATDATA='$(PACKRATDATA)' \
-  TZDIR=$(TZDIR) \
-  YEARISTYPE=$(YEARISTYPE) \
+@@ -600,7 +600,7 @@
+  TZDEFAULT='$(TZDEFAULT)' \
+  TZDIR='$(TZDIR)' \
+  YEARISTYPE='$(YEARISTYPE)' \
 - ZIC='$(ZIC)'
 + ZIC='$(ZIC_HOST)'
  
  # 'make install_data' installs one set of tz binary files.
- # It can be tailored by setting LEAPSECONDS, PACKRATDATA, etc.
+ install_data:	zic leapseconds yearistype tzdata.zi