Skip to content

Commit 558fae1

Browse files
committed
The attached patch enables the contrib subtree to build cleanly under
Cygwin with the possible exception of mSQL-interface. Since I don't have mSQL installed, I skipped this tool. Except for dealing with a missing getopt.h (oid2name) and HUGE (seg), the bulk of the patch uses the standard PostgreSQL approach to deal with Windows DLL issues. I tested the build aspect of this patch under Cygwin and Linux without any ill affects. Note that I did not actually attempt to test the code for functionality. The procedure to apply the patch is as follows: $ # save the attachment as /tmp/contrib.patch $ # change directory to the top of the PostgreSQL source tree $ patch -p0 </tmp/contrib.patch Jason
1 parent 22dc12b commit 558fae1

File tree

21 files changed

+42
-21
lines changed

21 files changed

+42
-21
lines changed

contrib/array/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.14 2001/02/20 19:20:26 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.15 2001/06/18 21:38:01 momjian Exp $
33
#
44

55
subdir = contrib/array
@@ -11,6 +11,7 @@ SONAME := $(NAME)$(DLSUFFIX)
1111

1212
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
1313
override CFLAGS += $(CFLAGS_SL)
14+
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1415

1516
all: $(SONAME) $(NAME).sql
1617

contrib/cube/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.3 2001/02/20 19:20:27 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.4 2001/06/18 21:38:01 momjian Exp $
33
#
44

55
subdir = contrib/cube
@@ -15,6 +15,7 @@ SO_MAJOR_VERSION= 1
1515
SO_MINOR_VERSION= 0
1616

1717
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
18+
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1819

1920
OBJS= cube.o cubeparse.o cubescan.o buffer.o
2021

contrib/dblink/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ override CFLAGS += -I$(srcdir)
1212
override CFLAGS += -I$(include_srcdir)
1313
override CFLAGS += -I$(libpq_srcdir)
1414
override CFLAGS += $(CFLAGS_SL)
15+
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1516

1617
OBJS = $(NAME).o
1718

contrib/earthdistance/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.9 2001/05/30 12:58:45 momjian Exp $
2+
# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.10 2001/06/18 21:38:01 momjian Exp $
33
#
44

55
subdir = contrib/earthdistance
@@ -11,6 +11,7 @@ SONAME := $(NAME)$(DLSUFFIX)
1111

1212
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
1313
override CFLAGS += $(CFLAGS_SL)
14+
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1415

1516
all: $(SONAME) $(NAME).sql
1617

contrib/fulltextindex/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.10 2001/06/18 21:38:01 momjian Exp $
33
#
44

55
subdir = contrib/fulltextindex
@@ -11,6 +11,7 @@ SONAME := $(NAME)$(DLSUFFIX)
1111

1212
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
1313
override CFLAGS += $(CFLAGS_SL)
14+
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1415

1516
all: $(SONAME) $(NAME).sql
1617

contrib/intarray/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.6 2001/05/31 19:25:27 tgl Exp $
1+
# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.7 2001/06/18 21:38:01 momjian Exp $
22

33
subdir = contrib/intarray
44
top_builddir = ../..
@@ -13,6 +13,7 @@ SO_MAJOR_VERSION= 1
1313
SO_MINOR_VERSION= 0
1414

1515
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
16+
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1617

1718
OBJS= _int.o
1819

contrib/isbn_issn/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.10 2001/06/18 21:38:01 momjian Exp $
33
#
44

55
subdir = contrib/isbn_issn
@@ -11,6 +11,7 @@ SONAME := $(NAME)$(DLSUFFIX)
1111

1212
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
1313
override CFLAGS += $(CFLAGS_SL)
14+
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1415

1516
all: $(SONAME) $(NAME).sql
1617

contrib/lo/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.10 2001/06/18 21:38:01 momjian Exp $
33
#
44

55
subdir = contrib/lo
@@ -14,6 +14,7 @@ MODS = $(NAME)$(DLSUFFIX)
1414

1515
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
1616
override CFLAGS += $(CFLAGS_SL)
17+
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1718

1819
ifdef REFINT_VERBOSE
1920
override CPPFLAGS+= -DREFINT_VERBOSE

contrib/miscutil/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.14 2001/02/20 19:20:27 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.15 2001/06/18 21:38:01 momjian Exp $
33
#
44

55
subdir = contrib/miscutil
@@ -11,6 +11,7 @@ SONAME := $(NAME)$(DLSUFFIX)
1111

1212
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
1313
override CFLAGS += $(CFLAGS_SL)
14+
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1415

1516
all: $(SONAME) $(NAME).sql
1617

contrib/noupdate/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.7 2001/02/20 19:20:27 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.8 2001/06/18 21:38:02 momjian Exp $
33
#
44

55
subdir = contrib/noupdate
@@ -11,6 +11,7 @@ SONAME := $(NAME)$(DLSUFFIX)
1111

1212
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
1313
override CFLAGS += $(CFLAGS_SL)
14+
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1415

1516
all: $(SONAME) $(NAME).sql
1617

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy