X-Git-Url: http://gitweb/?a=blobdiff_plain;f=tzdata%2Fzic_host-makefile.patch;h=f18fcf2260a821d56f9c0cb959158dd30f5b7258;hb=4466e574d8c1151a707caddb2238a54f986cab6f;hp=18698d17840463e4f16c494442187ba8eb2723ab;hpb=6c4f6dc574ad334bd625e53947bc3cf3e6a584c0;p=crossrootfs.git

diff --git a/tzdata/zic_host-makefile.patch b/tzdata/zic_host-makefile.patch
index 18698d1..f18fcf2 100644
--- a/tzdata/zic_host-makefile.patch
+++ b/tzdata/zic_host-makefile.patch
@@ -1,63 +1,29 @@
---- Makefile.orig	2015-11-16 11:06:13.302320678 +0000
-+++ Makefile	2015-11-16 11:07:23.232321567 +0000
-@@ -236,8 +236,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=		./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) -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
-@@ -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.
+ install_data:	zic leapseconds yearistype tzdata.zi