Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Feb 2010 06:44:00 +0000 (UTC)
From:      Edwin Groothuis <edwin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r204347 - in head: lib/libc/gen lib/libc/stdtime usr.sbin/zic/zdump usr.sbin/zic/zic
Message-ID:  <201002260644.o1Q6i06B060374@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: edwin
Date: Fri Feb 26 06:44:00 2010
New Revision: 204347
URL: http://svn.freebsd.org/changeset/base/204347

Log:
  Split the contributed code from libc/stdtime from lib/libc/stdtime
  to contrib/tzcode/stdtime.

Deleted:
  head/lib/libc/stdtime/asctime.c
  head/lib/libc/stdtime/ctime.3
  head/lib/libc/stdtime/difftime.c
  head/lib/libc/stdtime/localtime.c
  head/lib/libc/stdtime/private.h
  head/lib/libc/stdtime/time2posix.3
  head/lib/libc/stdtime/tzfile.5
  head/lib/libc/stdtime/tzfile.h
Modified:
  head/lib/libc/gen/sysconf.c
  head/lib/libc/stdtime/Makefile.inc
  head/usr.sbin/zic/zdump/Makefile
  head/usr.sbin/zic/zic/Makefile

Modified: head/lib/libc/gen/sysconf.c
==============================================================================
--- head/lib/libc/gen/sysconf.c	Fri Feb 26 06:35:24 2010	(r204346)
+++ head/lib/libc/gen/sysconf.c	Fri Feb 26 06:44:00 2010	(r204347)
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 
 #include "../stdlib/atexit.h"
-#include "../stdtime/tzfile.h"
+#include "tzfile.h"		/* from ../../../contrib/tzcode/stdtime */
 
 #define	_PATH_ZONEINFO	TZDIR	/* from tzfile.h */
 

Modified: head/lib/libc/stdtime/Makefile.inc
==============================================================================
--- head/lib/libc/stdtime/Makefile.inc	Fri Feb 26 06:35:24 2010	(r204346)
+++ head/lib/libc/stdtime/Makefile.inc	Fri Feb 26 06:44:00 2010	(r204347)
@@ -1,13 +1,16 @@
 #	Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/stdtime ${.CURDIR}/../locale
+.PATH:	${.CURDIR}/stdtime ${.CURDIR}/../locale \
+	${.CURDIR}/../../contrib/tzcode/stdtime
 
 SRCS+=	asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \
 	time32.c
 
 SYM_MAPS+= ${.CURDIR}/stdtime/Symbol.map
 
+CFLAGS+= -I${.CURDIR}/../../contrib/tzcode/stdtime -I${.CURDIR}/stdtime
+
 MAN+=	ctime.3 strftime.3 strptime.3 time2posix.3
 MAN+=	tzfile.5
 

Modified: head/usr.sbin/zic/zdump/Makefile
==============================================================================
--- head/usr.sbin/zic/zdump/Makefile	Fri Feb 26 06:35:24 2010	(r204346)
+++ head/usr.sbin/zic/zdump/Makefile	Fri Feb 26 06:44:00 2010	(r204347)
@@ -8,7 +8,7 @@ SRCS=	zdump.c ialloc.c scheck.c
 
 CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
 CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir
-CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
 
 WARNS?=	2
 

Modified: head/usr.sbin/zic/zic/Makefile
==============================================================================
--- head/usr.sbin/zic/zic/Makefile	Fri Feb 26 06:35:24 2010	(r204346)
+++ head/usr.sbin/zic/zic/Makefile	Fri Feb 26 06:44:00 2010	(r204347)
@@ -9,7 +9,7 @@ SRCS=	zic.c ialloc.c scheck.c
 CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
 CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir
 CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H
-CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
 
 WARNS?=	2
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002260644.o1Q6i06B060374>