| 1 |
vapier 13/09/28 10:55:44 |
| 2 |
|
| 3 |
Added: timezone-data-2013f-makefile.patch |
| 4 |
Removed: 2013f-makefile.patch |
| 5 |
Log: |
| 6 |
Clean up errors in patch/install, and handle the upgrade from previous versions #485720 by Dirkjan Ochtman. |
| 7 |
|
| 8 |
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sys-libs/timezone-data/files/timezone-data-2013f-makefile.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2013f-makefile.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2013f-makefile.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: timezone-data-2013f-makefile.patch |
| 17 |
=================================================================== |
| 18 |
- Fix up default paths |
| 19 |
- Support env CC |
| 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 |
|
| 26 |
--- a/Makefile |
| 27 |
+++ b/Makefile |
| 28 |
@@ -45,21 +45,21 @@ |
| 29 |
|
| 30 |
# Everything gets put in subdirectories of. . . |
| 31 |
|
| 32 |
-TOPDIR= /usr/local |
| 33 |
+TOPDIR= /usr |
| 34 |
|
| 35 |
# "Compiled" time zone information is placed in the "TZDIR" directory |
| 36 |
# (and subdirectories). |
| 37 |
# Use an absolute path name for TZDIR unless you're just testing the software. |
| 38 |
|
| 39 |
TZDIR_BASENAME= zoneinfo |
| 40 |
-TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) |
| 41 |
+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME) |
| 42 |
|
| 43 |
# Types to try, as an alternative to time_t. int64_t should be first. |
| 44 |
TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t |
| 45 |
|
| 46 |
# The "tzselect", "zic", and "zdump" commands get installed in. . . |
| 47 |
|
| 48 |
-ETCDIR= $(TOPDIR)/etc |
| 49 |
+SBINDIR= $(TOPDIR)/sbin |
| 50 |
|
| 51 |
# If you "make INSTALL", the "date" command gets installed in. . . |
| 52 |
|
| 53 |
@@ -67,7 +67,7 @@ |
| 54 |
|
| 55 |
# Manual pages go in subdirectories of. . . |
| 56 |
|
| 57 |
-MANDIR= $(TOPDIR)/man |
| 58 |
+MANDIR= $(TOPDIR)/share/man |
| 59 |
|
| 60 |
# Library functions are put in an archive in LIBDIR. |
| 61 |
|
| 62 |
@@ -294,8 +294,10 @@ |
| 63 |
|
| 64 |
############################################################################### |
| 65 |
|
| 66 |
-cc= cc |
| 67 |
-CC= $(cc) -DTZDIR=\"$(TZDIR)\" |
| 68 |
+CC+= -DTZDIR=\"$(TZDIR)\" |
| 69 |
+ifeq ($(NLS),1) |
| 70 |
+CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" |
| 71 |
+endif |
| 72 |
|
| 73 |
TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c |
| 74 |
TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o |
| 75 |
@@ -338,14 +340,16 @@ |
| 76 |
|
| 77 |
ALL: all date |
| 78 |
|
| 79 |
-install: all $(DATA) $(REDO) $(DESTDIR)$(TZLIB) $(MANS) |
| 80 |
+install: all $(DATA) $(REDO) $(MANS) |
| 81 |
$(ZIC) -y $(YEARISTYPE) \ |
| 82 |
-d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) |
| 83 |
-rm -f $(DESTDIR)$(TZDIR)/iso3166.tab \ |
| 84 |
$(DESTDIR)$(TZDIR)/zone.tab |
| 85 |
cp iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. |
| 86 |
- -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(ETCDIR) |
| 87 |
- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. |
| 88 |
+ -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(SBINDIR) |
| 89 |
+ cp zic zdump $(DESTDIR)$(SBINDIR)/. |
| 90 |
+ -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR) |
| 91 |
+ cp tzselect $(DESTDIR)$(BINDIR)/. |
| 92 |
-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \ |
| 93 |
$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ |
| 94 |
$(DESTDIR)$(MANDIR)/man8 |
| 95 |
@@ -356,8 +360,6 @@ |
| 96 |
$(DESTDIR)$(MANDIR)/man8/zdump.8 \ |
| 97 |
$(DESTDIR)$(MANDIR)/man8/zic.8 |
| 98 |
cp newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. |
| 99 |
- cp tzfile.5 $(DESTDIR)$(MANDIR)/man5/. |
| 100 |
- cp tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. |
| 101 |
|
| 102 |
INSTALL: ALL install date.1 |
| 103 |
-mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR) |
| 104 |
@@ -405,17 +407,17 @@ |
| 105 |
right_posix: right_only leapseconds |
| 106 |
rm -fr $(DESTDIR)$(TZDIR)-leaps |
| 107 |
- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \ |
| 108 |
+ ln -s . $(DESTDIR)$(TZDIR)/right || \ |
| 109 |
- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ |
| 110 |
+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ |
| 111 |
-L leapseconds $(TDATA) |
| 112 |
- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ |
| 113 |
+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ |
| 114 |
-L /dev/null $(TDATA) |
| 115 |
|
| 116 |
posix_right: posix_only leapseconds |
| 117 |
rm -fr $(DESTDIR)$(TZDIR)-posix |
| 118 |
- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \ |
| 119 |
+ ln -s . $(DESTDIR)$(TZDIR)/posix || \ |
| 120 |
- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ |
| 121 |
+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ |
| 122 |
-L /dev/null $(TDATA) |
| 123 |
- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ |
| 124 |
+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ |
| 125 |
-L leapseconds $(TDATA) |
| 126 |
|
| 127 |
zones: $(REDO) |
| 128 |
@@ -442,7 +442,7 @@ |
| 129 |
<$? >$@ |
| 130 |
chmod +x $@ |
| 131 |
|
| 132 |
-check: check_character_set check_tables check_web |
| 133 |
+check: check_character_set check_tables |
| 134 |
|
| 135 |
check_character_set: $(ENCHILADA) |
| 136 |
sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA) |
Archives