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

diff --git a/tzdata/tzcode-makefile.patch b/tzdata/tzcode-makefile.patch
index d123b96..1c964c1 100644
--- a/tzdata/tzcode-makefile.patch
+++ b/tzdata/tzcode-makefile.patch
@@ -1,39 +1,43 @@
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/2013f-makefile.patch
+# added some fixes for the file-layout (jue)
+#
+# - Support env CC
+# - Don't build/install libtz.a
+# - Don't install man-pages provided by man-pages
+# - Move zic, zdump to sbin and tzselect to bin ala glibc
+# - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
+# - Install leaps zoneinfo into zoneinfo/right/ ala glibc
+
 
 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
-@@ -39,17 +39,17 @@
+--- tzcode.orig/Makefile	2013-12-21 14:05:52.169527862 +0100
++++ tzcode/Makefile	2013-12-21 14:06:05.299054045 +0100
+@@ -45,21 +45,21 @@
  
  # Everything gets put in subdirectories of. . .
  
 -TOPDIR=		/usr/local
-+TOPDIR=		$(DESTDIR)/usr
++TOPDIR=		/usr
  
  # "Compiled" time zone information is placed in the "TZDIR" directory
  # (and subdirectories).
  # Use an absolute path name for TZDIR unless you're just testing the software.
  
--TZDIR=		$(TOPDIR)/etc/zoneinfo
-+TZDIR=		$(TOPDIR)/share/zoneinfo
+ TZDIR_BASENAME=	zoneinfo
+-TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
++TZDIR=		$(TOPDIR)/share/$(TZDIR_BASENAME)
+ 
+ # Types to try, as an alternative to time_t.  int64_t should be first.
+ TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
  
  # The "tzselect", "zic", and "zdump" commands get installed in. . .
  
 -ETCDIR=		$(TOPDIR)/etc
-+SBINDIR=	$(TOPDIR)/sbin
++SBINDIR=		$(TOPDIR)/sbin
  
  # 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 @@
+@@ -290,8 +290,10 @@
  
  ###############################################################################
  
@@ -41,88 +45,66 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile
 -CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
 +CC+=		-DTZDIR=\"$(TZDIR)\"
 +ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
++CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
 +endif
  
- 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 @@
+ AR=		ar
  
+@@ -341,19 +343,18 @@
  ALL:		all date
  
--install:	all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install:	all $(DATA) $(REDO) $(MANS) $(TABDATA)
+ install:	all $(DATA) $(REDO) $(MANS)
+-		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
+-			$(DESTDIR)$(LIBDIR) \
++		mkdir -p $(DESTDIR)$(SBINDIR) $(DESTDIR)$(TZDIR) \
++			$(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) \
+ 			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
+ 			$(DESTDIR)$(MANDIR)/man8
  		$(ZIC) -y $(YEARISTYPE) \
- 			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- 		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- 		cp iso3166.tab zone.tab $(TZDIR)/.
--		-mkdir $(TOPDIR) $(ETCDIR)
--		cp tzselect zic zdump $(ETCDIR)/.
-+		-mkdir $(TOPDIR) $(SBINDIR)
-+		cp zic zdump $(SBINDIR)/.
-+		-mkdir $(TOPDIR) $(BINDIR)
-+		cp tzselect $(BINDIR)/.
- 		-mkdir $(TOPDIR) $(MANDIR) \
- 			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
- 		-rm -f $(MANDIR)/man3/newctime.3 \
-@@ -314,8 +318,6 @@
- 			$(MANDIR)/man8/zdump.8 \
- 			$(MANDIR)/man8/zic.8
- 		cp newctime.3 newtzset.3 $(MANDIR)/man3/.
--		cp tzfile.5 $(MANDIR)/man5/.
--		cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
+ 			-d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
+ 		cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/.
+-		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
++		cp zic zdump $(DESTDIR)$(SBINDIR)/.
++		cp tzselect $(DESTDIR)$(BINDIR)/.
+ 		cp libtz.a $(DESTDIR)$(LIBDIR)/.
+ 		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
+ 		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
+-		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
+-		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
  
  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 @@
+ 		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
+@@ -396,19 +397,17 @@
  # 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) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- 		$(ZIC) -y $(YEARISTYPE) \
--			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+			-d $(TZDIR)/right -L leapseconds $(TDATA)
- 
- 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 @@
+ right_posix:	right_only leapseconds
+-		rm -fr $(DESTDIR)$(TZDIR)-leaps
+-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
+-		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
++		rm -fr $(DESTDIR)$(TZDIR)/right
++		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
+ 			-L leapseconds $(TDATA)
+-		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
++		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
+ 			-L /dev/null $(TDATA)
+ 
+ posix_right:	posix_only leapseconds
+ 		rm -fr $(DESTDIR)$(TZDIR)-posix
+-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
+-		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
++		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
+ 			-L /dev/null $(TDATA)
+-		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
++		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
+ 			-L leapseconds $(TDATA)
+ 
+ zones:		$(REDO)
+@@ -431,7 +430,7 @@
  			<$? >$@
  		chmod +x $@
  
--check:		check_tables check_web
-+check:		check_tables
- 
- 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
+-check:		check_character_set check_tables check_web
++check:		check_character_set check_tables
  
+ check_character_set: $(ENCHILADA)
+ 		sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA)