X-Git-Url: http://gitweb/?a=blobdiff_plain;f=tzdata%2Ftzcode-makefile.patch;h=683184dba326e9b4ec3a6bf6f05ebf27d5fd1b91;hb=25d21bea3e1cf6bfb60f93cf7a2de13e555f8a20;hp=d123b9664d659e51144ed15fe9a23f7e5dc01ee8;hpb=6214a1c83f5300e06961487b7c208ec6553ccfbb;p=crossrootfs.git

diff --git a/tzdata/tzcode-makefile.patch b/tzdata/tzcode-makefile.patch
index d123b96..683184d 100644
--- a/tzdata/tzcode-makefile.patch
+++ b/tzdata/tzcode-makefile.patch
@@ -1,8 +1,9 @@
 # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch
+# Patch reapplied and fixed for tzcode 2012i
 
 diff -Nru tzcode.orig/Makefile tzcode/Makefile
---- tzcode.orig/Makefile	2012-09-13 10:25:47.698561812 +0200
-+++ tzcode/Makefile	2012-09-13 10:31:12.070115537 +0200
+--- tzcode.orig/Makefile	2012-11-04 10:31:01.772733264 +0100
++++ tzcode/Makefile	2012-11-04 10:31:16.358872807 +0100
 @@ -39,17 +39,17 @@
  
  # Everything gets put in subdirectories of. . .
@@ -24,16 +25,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
  
  # If you "make INSTALL", the "date" command gets installed in. . .
  
-@@ -223,7 +223,7 @@
- ZIC=		$(zic) $(ZFLAGS)
- 
- # The name of a Posix-compliant `awk' on your system.
--AWK=		nawk
-+AWK=		awk
- 
- # The path where SGML DTDs are kept.
- # The default is appropriate for Ubuntu.
-@@ -257,8 +257,10 @@
+@@ -274,8 +274,10 @@
  
  ###############################################################################
  
@@ -46,7 +38,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
  
  TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
  TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -298,13 +300,15 @@
+@@ -316,13 +318,15 @@
  
  ALL:		all date
  
@@ -65,7 +57,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
  		-mkdir $(TOPDIR) $(MANDIR) \
  			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
  		-rm -f $(MANDIR)/man3/newctime.3 \
-@@ -314,8 +318,6 @@
+@@ -332,8 +336,6 @@
  			$(MANDIR)/man8/zdump.8 \
  			$(MANDIR)/man8/zic.8
  		cp newctime.3 newtzset.3 $(MANDIR)/man3/.
@@ -74,20 +66,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
  
  INSTALL:	ALL install date.1
  		-mkdir $(TOPDIR) $(BINDIR)
-@@ -329,10 +331,10 @@
- 		  'static char const TZVERSION[]="tz$(VERSION)";'
- 
- zdump:		$(TZDOBJS)
--		$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
- 
- zic:		$(TZCOBJS) yearistype
--		$(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
- 
- yearistype:	yearistype.sh
- 		cp yearistype.sh yearistype
-@@ -354,9 +356,9 @@
+@@ -372,9 +374,9 @@
  # You must replace all of $(TZDIR) to switch from not using leap seconds
  # to using them, or vice versa.
  other_two:	zic leapseconds $(TDATA)
@@ -99,16 +78,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
  
  posix_right:	posix_only other_two
  
-@@ -371,7 +373,7 @@
- 			then ranlib $@ ; fi
- 
- date:		$(DATEOBJS)
--		$(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \
-+		$(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \
- 			$(LDLIBS) -lc -o $@
- 
- tzselect:	tzselect.ksh
-@@ -382,7 +384,7 @@
+@@ -400,7 +402,7 @@
  			<$? >$@
  		chmod +x $@
  
@@ -117,12 +87,3 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
  
  check_tables:	checktab.awk $(PRIMARY_YDATA)
  		$(AWK) -f checktab.awk $(PRIMARY_YDATA)
-diff -Nru tzcode.orig/tzselect.ksh tzcode/tzselect.ksh
---- tzcode.orig/tzselect.ksh	2012-09-13 10:25:47.698561812 +0200
-+++ tzcode/tzselect.ksh	2012-09-13 10:26:06.107893321 +0200
-@@ -1,4 +1,4 @@
--#! /bin/ksh
-+#! /bin/bash
- 
- TZVERSION=see_Makefile
-