Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7146eb0

Browse files
committed
Integrate timezone library to be called only from Win32.
Timezone code backend integration done by Magnus Hagander.
1 parent7d6f37b commit7146eb0

File tree

5 files changed

+21
-9
lines changed

5 files changed

+21
-9
lines changed

‎configure‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12017,6 +12017,8 @@ LIBOBJS="$LIBOBJS rand.$ac_objext"
1201712017
cat >>confdefs.h <<\_ACEOF
1201812018
#define PGTZ 1
1201912019
_ACEOF
12020+
12021+
PGTZ=yes
1202012022
;;
1202112023
esac
1202212024

@@ -18611,6 +18613,7 @@ s,@python_includespec@,$python_includespec,;t t
1861118613
s,@python_libspec@,$python_libspec,;t t
1861218614
s,@LIBOBJS@,$LIBOBJS,;t t
1861318615
s,@HAVE_IPV6@,$HAVE_IPV6,;t t
18616+
s,@PGTZ@,$PGTZ,;t t
1861418617
s,@acx_pthread_config@,$acx_pthread_config,;t t
1861518618
s,@PTHREAD_CC@,$PTHREAD_CC,;t t
1861618619
s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t

‎configure.in‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.340 2004/04/30 04:18:28 momjian Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.341 2004/04/30 04:31:51 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -895,7 +895,9 @@ AC_LIBOBJ(open)
895895
AC_LIBOBJ(pipe)
896896
AC_LIBOBJ(rand)
897897
AC_DEFINE(PGTZ, 1,
898-
[Define to 1 to use our own timezone library]) ;;
898+
[Define to 1 to use our own timezone library])
899+
PGTZ=yes
900+
AC_SUBST(PGTZ) ;;
899901
esac
900902

901903
# Win32 can't to rename or unlink on an open file

‎src/Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/Makefile,v 1.31 2004/04/26 00:48:38 momjian Exp $
7+
# $PostgreSQL: pgsql/src/Makefile,v 1.32 2004/04/30 04:31:52 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -15,6 +15,7 @@ include Makefile.global
1515

1616
allinstallinstalldirsuninstalldepdependdistprep:
1717
$(MAKE) -C port$@
18+
$(MAKE) -C timezone$@
1819
$(MAKE) -C backend$@
1920
$(MAKE) -C backend/utils/mb/conversion_procs$@
2021
$(MAKE) -C include$@
@@ -27,6 +28,7 @@ install-all-headers:
2728

2829
clean:
2930
$(MAKE) -C port$@
31+
$(MAKE) -C timezone$@
3032
$(MAKE) -C backend$@
3133
$(MAKE) -C include$@
3234
$(MAKE) -C interfaces$@
@@ -39,6 +41,7 @@ clean:
3941

4042
distcleanmaintainer-clean:
4143
-$(MAKE) -C port$@
44+
-$(MAKE) -C timezone$@
4245
-$(MAKE) -C backend$@
4346
-$(MAKE) -C include$@
4447
-$(MAKE) -C interfaces$@

‎src/Makefile.global.in‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.178 2004/04/23 18:15:53 momjian Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.179 2004/04/30 04:31:52 momjian Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -150,6 +150,8 @@ TK_XINCLUDES= @TK_XINCLUDES@
150150
PTHREAD_CFLAGS= @PTHREAD_CFLAGS@
151151
PTHREAD_LIBS= @PTHREAD_LIBS@
152152

153+
PGTZ= @PGTZ@
154+
153155
have_docbook= @have_docbook@
154156
DOCBOOKSTYLE= @DOCBOOKSTYLE@
155157
COLLATEINDEX= @COLLATEINDEX@

‎src/timezone/Makefile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,32 @@
44
# Makefile for the timezone library
55

66
# IDENTIFICATION
7-
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.1 2004/04/30 04:09:23 momjian Exp $
7+
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.2 2004/04/30 04:31:52 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

11-
subdir = src/port/tz
12-
top_builddir = ../../..
11+
subdir = src/tz
12+
top_builddir = ../..
1313
include$(top_builddir)/src/Makefile.global
1414

1515
OBJS= asctime.o difftime.o localtime.o pgtz.o
16-
ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.o pgtz.o ../path.o
16+
ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.o pgtz.o
1717

1818
TZDATA := africa antarctica asia australasia europe northamerica southamerica pacificnew etcetera factory backward systemv solar87 solar88 solar89
1919
TZDATAFILES :=$(TZDATA:%=data/%)
2020

21+
ifeq ($(PGTZ), yes)
2122
all: SUBSYS.o zic
2223

2324
SUBSYS.o:$(OBJS)
2425
$(LD)$(LDREL)$(LDOUT) SUBSYS.o$(OBJS)
2526

26-
2727
zic:$(ZICOBJS)
2828

2929
install: zic
3030
zic -d$(datadir)/timezone$(TZDATAFILES)
3131

3232
cleandistcleanmaintainer-clean:
3333
rm -f SUBSYS.o$(OBJS)$(ZICOBJS)
34+
endif
35+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp