diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-07 11:45:07 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-01-07 11:45:07 +0000 |
| commit | 670a687dea6773147a227bebfa9d801dae739ee0 (patch) | |
| tree | 380b348ef7d52bd144e78f4a661dda0b40e87477 /timezone/Makefile | |
| parent | 45c4f3665aaa63cab148cc9cc96fa07c666c1c38 (diff) | |
| download | glibc-670a687dea6773147a227bebfa9d801dae739ee0.zip glibc-670a687dea6773147a227bebfa9d801dae739ee0.tar.gz glibc-670a687dea6773147a227bebfa9d801dae739ee0.tar.bz2 | |
Update timezone code from tzcode 2015g.
This patch updates the timezone code from tzcode 2015g. The Makefile
and README changes are based on those in Paul's patch
<https://sourceware.org/ml/libc-alpha/2015-05/msg00553.html>.
Tested for x86_64 and x86.
2016-01-06 Paul Eggert <eggert@cs.ucla.edu>
Joseph Myers <joseph@codesourcery.com>
* timezone/private.h: Update from tzcode 2015g.
* timezone/tzfile.h: Likewise.
* timezone/tzselect.ksh: Likewise.
* timezone/zdump.c: Likewise.
* timezone/zic.c: Likewise.
* timezone/ialloc.c: Remove file.
* timezone/scheck.c: Likewise.
* timezone/Makefile (extra-objs): Remove variable.
($(objpfx)zic): Do not depend on scheck.o and ialloc.o.
(tz-cflags): Add -DHAVE_GETTEXT -DUSE_LTZ=0
-Wno-maybe-uninitialized.
(CFLAGS-zdump.c): Remove -fwrapv -DNOID -DHAVE_GETTEXT.
(CFLAGS-zic.c): Remove -DNOID -DHAVE_GETTEXT.
(CFLAGS-ialloc.c): Remove variable.
(CFLAGS-scheck.c): Likewise.
* timezone/README: Update list of files from tzcode.
Diffstat (limited to 'timezone/Makefile')
| -rw-r--r-- | timezone/Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/timezone/Makefile b/timezone/Makefile index e929a5f..e6a6a08 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -22,8 +22,6 @@ subdir := timezone include ../Makeconfig -extra-objs := scheck.o ialloc.o - others := zdump zic tests := test-tz tst-timezone tst-tzset @@ -49,8 +47,6 @@ endif include ../Rules -$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o - $(objpfx)zic.o $(objpfx)zdump.o: $(objpfx)version.h $(objpfx)version.h: $(common-objpfx)config.make @@ -61,15 +57,14 @@ $(objpfx)version.h: $(common-objpfx)config.make tz-cflags = -DTZDIR='"$(zonedir)"' \ -DTZDEFAULT='"$(localtime-file)"' \ -DTZDEFRULES='"$(posixrules-file)"' \ - -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone + -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone \ + -DHAVE_GETTEXT -DUSE_LTZ=0 -Wno-maybe-uninitialized # The -Wno-unused-variable flag is used to prevent GCC 6 # from warning about time_t_min and time_t_max which are # defined in private.h but not used. -CFLAGS-zdump.c = -fwrapv -DNOID $(tz-cflags) -DHAVE_GETTEXT -CFLAGS-zic.c = -DNOID $(tz-cflags) -DHAVE_GETTEXT -Wno-unused-variable -CFLAGS-ialloc.c = -DNOID -DHAVE_GETTEXT -Wno-unused-variable -CFLAGS-scheck.c = -DNOID -DHAVE_GETTEXT -Wno-unused-variable +CFLAGS-zdump.c = $(tz-cflags) +CFLAGS-zic.c = $(tz-cflags) -Wno-unused-variable # We have to make sure the data for testing the tz functions is available. # Don't add leapseconds here since test-tz made checks that work only without |