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

Commit6faf150

Browse files
committed
Fix/cleanup DLLLIBS handling for Cygwin port. If it works it's to
Jason Tishler's credit, if it's broken it's my fault ...
1 parentd3ad2ad commit6faf150

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
lines changed

‎contrib/spi/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.19 2001/02/20 19:20:28 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.20 2001/04/04 21:15:56 tgl Exp $
33
#
44

55
subdir = contrib/spi
@@ -19,6 +19,9 @@ ifdef REFINT_VERBOSE
1919
overrideCPPFLAGS+= -DREFINT_VERBOSE
2020
endif
2121

22+
overrideDLLLIBS :=$(BE_DLLLIBS)$(DLLLIBS)
23+
24+
2225
all:$(MODS)$(SQLS)
2326

2427
%.sql:%.sql.in

‎src/backend/Makefile

Lines changed: 7 additions & 9 deletions
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-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.69 2001/04/02 03:21:23 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.70 2001/04/0421:15:56 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -43,11 +43,11 @@ else # win
4343

4444
# No points for style here. How about encapsulating some of these
4545
# commands into variables?
46-
postgres:$(DLLOBJS)$(top_builddir)/src/utils/dllinit.o postgres.def libpostgres.a
46+
postgres:$(OBJS)$(top_builddir)/src/utils/dllinit.o postgres.def libpostgres.a
4747
dlltool --dllname$@$(X) --output-exp$@.exp --def postgres.def
48-
gcc -g -o$@$(X) -Wl,--base-file,$@.base$@.exp$(DLLOBJS)$(DLLLIBS)
48+
gcc -g -o$@$(X) -Wl,--base-file,$@.base$@.exp$(OBJS)$(DLLLIBS)
4949
dlltool --dllname$@$(X) --base-file$@.base --output-exp$@.exp --def postgres.def
50-
gcc -g -o$@$(X)$@.exp$(DLLOBJS)$(DLLLIBS)
50+
gcc -g -o$@$(X)$@.exp$(OBJS)$(DLLLIBS)
5151
rm$@.exp$@.base
5252

5353
endif# win
@@ -64,12 +64,10 @@ $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir
6464

6565
ifeq ($(MAKE_DLL), true)
6666

67-
DLLOBJS :=$(OBJS)
67+
postgres.def:$(OBJS)
68+
$(DLLTOOL) --export-all --output-def$@$(OBJS)
6869

69-
postgres.def:$(DLLOBJS)
70-
$(DLLTOOL) --export-all --output-def$@$(DLLOBJS)
71-
72-
libpostgres.a:$(DLLOBJS)$(top_builddir)/src/utils/dllinit.o postgres.def
70+
libpostgres.a:$(OBJS)$(top_builddir)/src/utils/dllinit.o postgres.def
7371
$(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib$@
7472

7573
endif# MAKE_DLL

‎src/makefiles/Makefile.win

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.9 2001/02/20 19:20:29 petere Exp $
1+
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.10 2001/04/04 21:15:56 tgl Exp $
22
LDFLAGS+= -g
33
DLLTOOL= dlltool
44
DLLWRAP= dllwrap
5-
DLLLIBS=-L$(top_builddir)/src/backend -lpostgres -lcygipc -lcygwin -lcrypt -lkernel32
5+
DLLLIBS= -lcygipc -lcrypt
6+
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
67
MK_NO_LORDER=true
78
MAKE_DLL=true
89
#MAKE_DLL=false

‎src/pl/plpgsql/src/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for the plpgsql shared object
44
#
5-
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.12 2001/02/20 19:20:29 petere Exp $
5+
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.13 2001/04/04 21:15:56 tgl Exp $
66
#
77
#-------------------------------------------------------------------------
88

@@ -17,6 +17,8 @@ SO_MINOR_VERSION= 0
1717

1818
overrideCPPFLAGS := -I$(srcdir)$(CPPFLAGS)
1919

20+
overrideDLLLIBS :=$(BE_DLLLIBS)$(DLLLIBS)
21+
2022
OBJS = pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
2123

2224
all: all-lib

‎src/test/regress/GNUmakefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.33 2001/02/20 19:20:30 petere Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.34 2001/04/04 21:15:56 tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -20,6 +20,8 @@ contribdir := $(top_builddir)/contrib
2020
overrideCPPFLAGS := -I$(libpq_srcdir)$(CPPFLAGS)
2121
overrideCFLAGS +=$(CFLAGS_SL)
2222

23+
overrideDLLLIBS :=$(BE_DLLLIBS)$(DLLLIBS)
24+
2325

2426
##
2527
## Prepare for tests

0 commit comments

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