[gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data/files: timezone-data-2014h-makefile.patch

[gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data/files: timezone-data-2014h-makefile.patch

[Mike Frysinger (vapier)]

vapier      14/10/16 19:19:44

  Added:                timezone-data-2014h-makefile.patch
  Log:
  Version bump #524754 by Azamat H. Hackimov.
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.1                  sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch?rev=1.1&content-type=text/plain

Index: timezone-data-2014h-makefile.patch
===================================================================
 - Fix up default paths
 - Support env CC
 - Don't build/install libtz.a
 - Don't install man-pages provided by sys-apps/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
 - Do not run network based unittests

--- a/Makefile
+++ b/Makefile
@@ -45,21 +45,21 @@ POSIXRULES=	America/New_York
 
 # Everything gets put in subdirectories of. . .
 
-TOPDIR=		/usr/local
+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_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
 
 # If you "make INSTALL", the "date" command gets installed in. . .
 
@@ -67,7 +67,7 @@ BINDIR=		$(TOPDIR)/bin
 
 # Manual pages go in subdirectories of. . .
 
-MANDIR=		$(TOPDIR)/man
+MANDIR=		$(TOPDIR)/share/man
 
 # Library functions are put in an archive in LIBDIR.
 
@@ -298,8 +298,10 @@ GZIPFLAGS=	-9n
 
 ###############################################################################
 
-cc=		cc
-CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
+CC+=		-DTZDIR=\"$(TZDIR)\"
+ifeq ($(NLS),1)
+CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
+endif
 
 AR=		ar
 
@@ -352,17 +354,14 @@ ALL:		all date
 install:	all $(DATA) $(REDO) $(MANS)
 		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
-			$(DESTDIR)$(LIBDIR) \
+			$(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \
 			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
 			$(DESTDIR)$(MANDIR)/man8
 		$(ZIC) -y $(YEARISTYPE) \
 			-d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
 		cp -f iso3166.tab $(ZONETABLES) $(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 -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
@@ -406,18 +408,18 @@ right_only:	zic leapseconds $(TDATA)
 # to using them, or vice versa.
 right_posix:	right_only leapseconds
 		rm -fr $(DESTDIR)$(TZDIR)-leaps
-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
-		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
+		ln -s . $(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 \
+		ln -s . $(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)
 
 posix_packrat:	posix_only backzone
@@ -440,7 +442,7 @@ tzselect:	tzselect.ksh
 		chmod +x $@
 
 check:		check_character_set check_white_space check_sorted \
-		  check_tables check_web
+		  check_tables
 
 check_character_set: $(ENCHILADA)
 		LC_ALL=en_US.utf8 && export LC_ALL && \

[gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data/files: timezone-data-2014h-makefile.patch

[Mike Frysinger (vapier)]

vapier      14/10/26 03:19:56

  Modified:             timezone-data-2014h-makefile.patch
  Log:
  Fix CPPFLAGS usage #526790 by Victor.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.2                  sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch?r1=1.1&r2=1.2

Index: timezone-data-2014h-makefile.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- timezone-data-2014h-makefile.patch	16 Oct 2014 19:19:44 -0000	1.1
+++ timezone-data-2014h-makefile.patch	26 Oct 2014 03:19:56 -0000	1.2
@@ -49,9 +49,9 @@
  
 -cc=		cc
 -CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+=		-DTZDIR=\"$(TZDIR)\"
++CPPFLAGS+=		-DTZDIR=\"$(TZDIR)\"
 +ifeq ($(NLS),1)
-+CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
++CPPFLAGS+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
 +endif
  
  AR=		ar