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

Commitf3f8d36

Browse files
committed
Update Makefile dependencies for Win32 timezones, per Claudio.
1 parent3b382d1 commitf3f8d36

File tree

4 files changed

+14
-21
lines changed

4 files changed

+14
-21
lines changed

‎configure

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17974,8 +17974,9 @@ ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
1797417974
ac_config_links="$ac_config_links src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION} src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION} src/include/dynloader.h:src/backend/port/dynloader/${template}.h src/include/pg_config_os.h:src/include/port/${template}.h src/Makefile.port:src/makefiles/Makefile.${template}"
1797517975

1797617976

17977-
case $host_os in mingw*)
17978-
ac_config_commands="$ac_config_commands default-1"
17977+
case $host_os in mingw*);;
17978+
*)
17979+
ac_config_commands="$ac_config_commands check_win32_symlinks"
1797917980

1798017981
;;
1798117982
esac
@@ -18450,16 +18451,9 @@ done
1845018451

1845118452
_ACEOF
1845218453

18453-
cat >>$CONFIG_STATUS <<_ACEOF
18454-
#
18455-
# INIT-COMMANDS section.
18456-
#
1845718454

1845818455

1845918456

18460-
_ACEOF
18461-
18462-
1846318457

1846418458
cat >>$CONFIG_STATUS <<\_ACEOF
1846518459
for ac_config_target in $ac_config_targets
@@ -18475,7 +18469,7 @@ do
1847518469
"src/include/dynloader.h" ) CONFIG_LINKS="$CONFIG_LINKS src/include/dynloader.h:src/backend/port/dynloader/${template}.h" ;;
1847618470
"src/include/pg_config_os.h" ) CONFIG_LINKS="$CONFIG_LINKS src/include/pg_config_os.h:src/include/port/${template}.h" ;;
1847718471
"src/Makefile.port" ) CONFIG_LINKS="$CONFIG_LINKS src/Makefile.port:src/makefiles/Makefile.${template}" ;;
18478-
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDSdefault-1" ;;
18472+
"check_win32_symlinks" ) CONFIG_COMMANDS="$CONFIG_COMMANDScheck_win32_symlinks" ;;
1847918473
"src/include/pg_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/pg_config.h" ;;
1848018474
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
1848118475
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -19229,13 +19223,12 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
1922919223
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
1923019224
echo "$as_me: executing $ac_dest commands" >&6;}
1923119225
case $ac_dest in
19232-
default-1 )
19226+
check_win32_symlinks )
1923319227
# Links sometimes fail undetected on Mingw -
1923419228
# so here we detect it and warn the user
1923519229
for FILE in "$CONFIG_LINKS"
1923619230
do
1923719231
# test -e works for symlinks in the MinGW console
19238-
# We can't call AC_MSG_WARN from here, so we expand it
1923919232
test -e `expr "$FILE" : '\(^:*\)'` || { echo "$as_me:$LINENO: WARNING: *** link for $FILE - please fix by hand" >&5
1924019233
echo "$as_me: WARNING: *** link for $FILE - please fix by hand" >&2;}
1924119234
done

‎configure.in

Lines changed: 5 additions & 6 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.349 2004/05/17 19:14:47 momjian Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.350 2004/05/18 04:10:30 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1236,16 +1236,15 @@ AC_CONFIG_LINKS([
12361236
src/Makefile.port:src/makefiles/Makefile.${template}
12371237
])
12381238

1239-
case $host_os in mingw*)
1240-
AC_OUTPUT_COMMANDS([
1239+
case $host_os in mingw*);;
1240+
*)
1241+
AC_CONFIG_COMMANDS([check_win32_symlinks],[
12411242
# Links sometimes fail undetected on Mingw -
12421243
# so here we detect it and warn the user
12431244
for FILE in "$CONFIG_LINKS"
12441245
do
12451246
# test -e works for symlinks in the MinGW console
1246-
# We can't call AC_MSG_WARN from here, so we expand it
1247-
test -e `expr "$FILE" : '\(^:*\)'` || { echo "$as_me:$LINENO: WARNING: *** link for $FILE - please fix by hand" >&5
1248-
echo "$as_me: WARNING: *** link for $FILE - please fix by hand" >&2;}
1247+
test -e `expr "$FILE" : '\(^:*\)'` || AC_MSG_WARN([*** link for $FILE - please fix by hand])
12491248
done
12501249
])
12511250
;;

‎src/timezone/Makefile

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

66
# IDENTIFICATION
7-
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.8 2004/05/17 14:35:34 momjian Exp $
7+
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.9 2004/05/18 04:10:33 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -19,15 +19,15 @@ TZDATA := africa antarctica asia australasia europe northamerica southamerica pa
1919
TZDATAFILES :=$(TZDATA:%=data/%)
2020

2121
ifeq ($(USE_PGTZ), yes)
22-
all: SUBSYS.o zic
22+
all: SUBSYS.osubmake-libpgportzic
2323

2424
SUBSYS.o:$(OBJS)
2525
$(LD)$(LDREL)$(LDOUT) SUBSYS.o$(OBJS)
2626

2727
zic:$(ZICOBJS)
2828
$(CC)$(CFLAGS)$(ZICOBJS)$(LDFLAGS)$(LIBS) -o$@$(X)
2929

30-
install:zic
30+
install:all installdirs
3131
./zic -d$(DESTDIR)$(datadir)/timezone$(TZDATAFILES)
3232

3333
cleandistcleanmaintainer-clean:

‎src/timezone/pgtz.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include"postgres.h"
2+
#include"miscadmin.h"
23

34
#ifndefHAVE_SYMLINK
45
#defineHAVE_SYMLINK 0

0 commit comments

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