1 |
vapier 13/03/03 01:54:25 |
2 |
|
3 |
Added: timezone-data-2013a-makefile.patch |
4 |
Log: |
5 |
Version bump. |
6 |
|
7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sys-libs/timezone-data/files/timezone-data-2013a-makefile.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2013a-makefile.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2013a-makefile.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: timezone-data-2013a-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,9 @@ |
40 |
# Use an absolute path name for TZDIR unless you're just testing the software. |
41 |
|
42 |
-TZDIR= $(TOPDIR)/etc/zoneinfo |
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 |
@@ -241,8 +241,10 @@ |
59 |
|
60 |
############################################################################### |
61 |
|
62 |
-cc= cc |
63 |
-CC= $(cc) -DTZDIR=\"$(TZDIR)\" |
64 |
+CC+= -DTZDIR=\"$(TZDIR)\" |
65 |
+ifeq ($(NLS),1) |
66 |
+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" |
67 |
+endif |
68 |
|
69 |
TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c |
70 |
TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o |
71 |
@@ -281,11 +281,13 @@ |
72 |
ALL: all date |
73 |
|
74 |
-install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) |
75 |
+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) |
76 |
$(ZIC) -y $(YEARISTYPE) \ |
77 |
-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) |
78 |
-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab |
79 |
cp iso3166.tab zone.tab $(TZDIR)/. |
80 |
- -mkdir $(TOPDIR) $(ETCDIR) |
81 |
- cp tzselect zic zdump $(ETCDIR)/. |
82 |
+ -mkdir $(TOPDIR) $(SBINDIR) |
83 |
+ cp zic zdump $(SBINDIR)/. |
84 |
+ -mkdir $(TOPDIR) $(BINDIR) |
85 |
+ cp tzselect $(BINDIR)/. |
86 |
-mkdir $(TOPDIR) $(MANDIR) \ |
87 |
$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 |
88 |
@@ -297,6 +299,4 @@ |
89 |
$(MANDIR)/man8/zic.8 |
90 |
cp newctime.3 newtzset.3 $(MANDIR)/man3/. |
91 |
- cp tzfile.5 $(MANDIR)/man5/. |
92 |
- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. |
93 |
|
94 |
INSTALL: ALL install date.1 |
95 |
@@ -333,7 +333,7 @@ |
96 |
# to using them, or vice versa. |
97 |
other_two: zic leapseconds $(TDATA) |
98 |
- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) |
99 |
+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) |
100 |
$(ZIC) -y $(YEARISTYPE) \ |
101 |
- -d $(TZDIR)-leaps -L leapseconds $(TDATA) |
102 |
+ -d $(TZDIR)/right -L leapseconds $(TDATA) |
103 |
|
104 |
posix_right: posix_only other_two |
105 |
@@ -366,5 +366,5 @@ |
106 |
chmod +x $@ |
107 |
|
108 |
-check: check_character_set check_tables check_web |
109 |
+check: check_character_set check_tables |
110 |
|
111 |
check_tables: checktab.awk $(PRIMARY_YDATA) |