Use glibc version information in zic and zdump.

This commit is contained in:
Joseph Myers 2012-11-10 00:31:20 +00:00
parent 0aa8f8a17f
commit 9ec6f8bd90
4 changed files with 15 additions and 4 deletions

View File

@ -1,5 +1,12 @@
2012-11-09 Joseph Myers <joseph@codesourcery.com> 2012-11-09 Joseph Myers <joseph@codesourcery.com>
* timezone/version.h: Remove file.
* timezone/README: Do not refer to version.h.
* timezone/Makefile ($(objpfx)zic.o): New dependency on
$(objpfx)version.h.
($(objpfx)zdump.o): Likewise.
($(objpfx)/version.h): New target.
* timezone/tzselect.ksh: Change to verbatim copy from tzcode * timezone/tzselect.ksh: Change to verbatim copy from tzcode
2012i. 2012i.
* timezone/README: Don't mention modification to tzselect.ksh. * timezone/README: Don't mention modification to tzselect.ksh.

View File

@ -54,6 +54,13 @@ include ../Rules
$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
$(objpfx)zic.o $(objpfx)zdump.o: $(objpfx)version.h
$(objpfx)version.h: $(common-objpfx)config.make
echo 'static char const TZVERSION[]="$(PKGVERSION)$(version)";' \
> $@.new
mv -f $@.new $@
tz-cflags = -DTZDIR='"$(zonedir)"' \ tz-cflags = -DTZDIR='"$(zonedir)"' \
-DTZDEFAULT='"$(localtime-file)"' \ -DTZDEFAULT='"$(localtime-file)"' \
-DTZDEFRULES='"$(posixrules-file)"' \ -DTZDEFRULES='"$(posixrules-file)"' \

View File

@ -1,9 +1,7 @@
The files The files
zic.c zdump.c ialloc.c scheck.c tzfile.h zic.c zdump.c ialloc.c scheck.c tzfile.h
private.h tzselect.ksh checktab.awk private.h tzselect.ksh checktab.awk
come from the tzcode package by Arthur David Olson et.al.; the file come from the tzcode package by Arthur David Olson et.al.
version.h
has the contents that would be generated by that package's Makefile.
The files The files
africa antarctica asia australasia europe africa antarctica asia australasia europe

View File

@ -1 +0,0 @@
static char const TZVERSION[]="tz2012i";