| 1 |
vapier 12/03/01 17:37:27 |
| 2 |
|
| 3 |
Added: timezone-data-2012a-makefile.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: timezone-data-2012a-makefile.patch |
| 16 |
=================================================================== |
| 17 |
- Fix up default paths |
| 18 |
- Support env DESTDIR / LDFLAGS / CFLAGS / CC |
| 19 |
- Use awk instead of nawk |
| 20 |
- Don't build/install libtz.a |
| 21 |
- Don't install man-pages provided by sys-apps/man-pages |
| 22 |
- Move zic zdump to sbin and tzselect to bin ala glibc |
| 23 |
- Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc |
| 24 |
- Install leaps zoneinfo into zoneinfo/right/ ala glibc |
| 25 |
- Disable broken web test |
| 26 |
- Make sure tzselect uses #!/bin/bash and not #!/bin/ksh |
| 27 |
- Flags to the linking are passed as LDFLAGS, not LFLAGS |
| 28 |
- LDFLAGS was missed for the 'date' target |
| 29 |
|
| 30 |
--- Makefile |
| 31 |
+++ Makefile |
| 32 |
@@ -35,5 +35,5 @@ |
| 33 |
# Everything gets put in subdirectories of. . . |
| 34 |
|
| 35 |
-TOPDIR= /usr/local |
| 36 |
+TOPDIR= $(DESTDIR)/usr |
| 37 |
|
| 38 |
# "Compiled" time zone information is placed in the "TZDIR" directory |
| 39 |
@@ -41,9 +41,8 @@ |
| 40 |
|
| 41 |
-# TZDIR= $(TOPDIR)/etc/zoneinfo |
| 42 |
-TZDIR= /home/kre/src/tz/data/TZ |
| 43 |
+TZDIR= $(TOPDIR)/share/zoneinfo |
| 44 |
|
| 45 |
# The "tzselect", "zic", and "zdump" commands get installed in. . . |
| 46 |
|
| 47 |
-ETCDIR= $(TOPDIR)/etc |
| 48 |
+SBINDIR= $(TOPDIR)/sbin |
| 49 |
|
| 50 |
# If you "make INSTALL", the "date" command gets installed in. . . |
| 51 |
@@ -53,5 +53,5 @@ |
| 52 |
# Manual pages go in subdirectories of. . . |
| 53 |
|
| 54 |
-MANDIR= $(TOPDIR)/man |
| 55 |
+MANDIR= $(TOPDIR)/share/man |
| 56 |
|
| 57 |
# Library functions are put in an archive in LIBDIR. |
| 58 |
@@ -211,5 +211,5 @@ |
| 59 |
# falls on a Friday, Saturday, or Sunday. |
| 60 |
|
| 61 |
-CFLAGS= -DSTD_INSPIRED |
| 62 |
+CFLAGS += -DSTD_INSPIRED -std=gnu99 |
| 63 |
|
| 64 |
# If you want zic's -s option used when installing, uncomment the next line |
| 65 |
@@ -220,5 +220,5 @@ |
| 66 |
|
| 67 |
# The name of a Posix-compliant `awk' on your system. |
| 68 |
-AWK= nawk |
| 69 |
+AWK= awk |
| 70 |
|
| 71 |
# The path where SGML DTDs are kept. |
| 72 |
@@ -241,8 +241,10 @@ |
| 73 |
|
| 74 |
############################################################################### |
| 75 |
|
| 76 |
-cc= cc |
| 77 |
-CC= $(cc) -DTZDIR=\"$(TZDIR)\" |
| 78 |
+CC+= -DTZDIR=\"$(TZDIR)\" |
| 79 |
+ifeq ($(NLS),1) |
| 80 |
+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" |
| 81 |
+endif |
| 82 |
|
| 83 |
TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c |
| 84 |
TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o |
| 85 |
@@ -281,11 +281,13 @@ |
| 86 |
ALL: all date |
| 87 |
|
| 88 |
-install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) |
| 89 |
+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) |
| 90 |
$(ZIC) -y $(YEARISTYPE) \ |
| 91 |
-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) |
| 92 |
-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab |
| 93 |
cp iso3166.tab zone.tab $(TZDIR)/. |
| 94 |
- -mkdir $(TOPDIR) $(ETCDIR) |
| 95 |
- cp tzselect zic zdump $(ETCDIR)/. |
| 96 |
+ -mkdir $(TOPDIR) $(SBINDIR) |
| 97 |
+ cp zic zdump $(SBINDIR)/. |
| 98 |
+ -mkdir $(TOPDIR) $(BINDIR) |
| 99 |
+ cp tzselect $(BINDIR)/. |
| 100 |
-mkdir $(TOPDIR) $(MANDIR) \ |
| 101 |
$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 |
| 102 |
@@ -297,6 +299,4 @@ |
| 103 |
$(MANDIR)/man8/zic.8 |
| 104 |
cp newctime.3 newtzset.3 $(MANDIR)/man3/. |
| 105 |
- cp tzfile.5 $(MANDIR)/man5/. |
| 106 |
- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. |
| 107 |
|
| 108 |
INSTALL: ALL install date.1 |
| 109 |
@@ -309,10 +309,10 @@ |
| 110 |
cp date.1 $(MANDIR)/man1/. |
| 111 |
|
| 112 |
zdump: $(TZDOBJS) |
| 113 |
- $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ |
| 114 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ |
| 115 |
|
| 116 |
zic: $(TZCOBJS) yearistype |
| 117 |
- $(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@ |
| 118 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@ |
| 119 |
|
| 120 |
yearistype: yearistype.sh |
| 121 |
cp yearistype.sh yearistype |
| 122 |
@@ -333,7 +333,7 @@ |
| 123 |
# to using them, or vice versa. |
| 124 |
other_two: zic leapseconds $(TDATA) |
| 125 |
- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) |
| 126 |
+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) |
| 127 |
$(ZIC) -y $(YEARISTYPE) \ |
| 128 |
- -d $(TZDIR)-leaps -L leapseconds $(TDATA) |
| 129 |
+ -d $(TZDIR)/right -L leapseconds $(TDATA) |
| 130 |
|
| 131 |
posix_right: posix_only other_two |
| 132 |
@@ -351,7 +351,7 @@ |
| 133 |
then ranlib $@ ; fi |
| 134 |
|
| 135 |
date: $(DATEOBJS) |
| 136 |
- $(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \ |
| 137 |
+ $(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \ |
| 138 |
$(LDLIBS) -lc -o $@ |
| 139 |
|
| 140 |
tzselect: tzselect.ksh |
| 141 |
@@ -366,5 +366,5 @@ |
| 142 |
chmod +x $@ |
| 143 |
|
| 144 |
-check: check_tables check_web |
| 145 |
+check: check_tables |
| 146 |
|
| 147 |
check_tables: checktab.awk $(PRIMARY_YDATA) |
| 148 |
--- tzselect.ksh |
| 149 |
+++ tzselect.ksh |
| 150 |
@@ -1,3 +1,3 @@ |
| 151 |
-#! /bin/ksh |
| 152 |
+#! /bin/bash |
| 153 |
|
| 154 |
# '@(#)tzselect.ksh 1.8' |
Archives