diff options
Diffstat (limited to 'sys-libs/timezone-data/files/timezone-data-2015c-makefile.patch')
| -rw-r--r-- | sys-libs/timezone-data/files/timezone-data-2015c-makefile.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/sys-libs/timezone-data/files/timezone-data-2015c-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2015c-makefile.patch new file mode 100644 index 000000000000..fef0f84f0878 --- /dev/null +++ b/sys-libs/timezone-data/files/timezone-data-2015c-makefile.patch @@ -0,0 +1,86 @@ + - 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 + - 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)\" ++CPPFLAGS+= -DTZDIR=\"$(TZDIR)\" ++ifeq ($(NLS),1) ++CPPFLAGS+= -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 +@@ -440,7 +442,7 @@ tzselect: tzselect.ksh + chmod +x $@ + + check: check_character_set check_white_space check_links check_sorted \ +- check_tables check_web ++ check_tables + + check_character_set: $(ENCHILADA) + LC_ALL=en_US.utf8 && export LC_ALL && \ |