X-Git-Url: http://gitweb/?a=blobdiff_plain;f=tzdata%2Fzic_host-makefile.patch;h=18698d17840463e4f16c494442187ba8eb2723ab;hb=a07eae877ba6ad2572912730950a7778a5517f67;hp=5772498c9d026747ac14a64e76cf8025e25f1779;hpb=fcacfef8b1865526968a771838d4c3f70808c2e0;p=crossrootfs.git

diff --git a/tzdata/zic_host-makefile.patch b/tzdata/zic_host-makefile.patch
index 5772498..18698d1 100644
--- a/tzdata/zic_host-makefile.patch
+++ b/tzdata/zic_host-makefile.patch
@@ -1,26 +1,26 @@
---- Makefile.orig	2014-10-01 15:40:50.900427432 +0000
-+++ Makefile	2014-10-01 15:42:37.400428739 +0000
-@@ -231,8 +231,8 @@
+--- Makefile.orig	2015-11-16 11:06:13.302320678 +0000
++++ Makefile	2015-11-16 11:07:23.232321567 +0000
+@@ -236,8 +236,8 @@
  
  LDFLAGS=	$(LFLAGS)
  
 -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 @@
+@@ -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 zone.tab $(DESTDIR)$(TZDIR)/.
+ 		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
  		cp zic zdump $(DESTDIR)$(SBINDIR)/.
-@@ -380,11 +380,11 @@
+@@ -410,11 +410,11 @@
  		$(AWK) -f leapseconds.awk leap-seconds.list >$@
  
  posix_only:	zic $(TDATA)
@@ -34,7 +34,7 @@
  			-L leapseconds $(TDATA)
  
  # In earlier versions of this makefile, the other two directories were
-@@ -398,16 +398,16 @@
+@@ -428,21 +428,21 @@
  # to using them, or vice versa.
  right_posix:	right_only leapseconds
  		rm -fr $(DESTDIR)$(TZDIR)/right
@@ -54,4 +54,10 @@
 +		$(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)