aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2015-07-18 10:09:04 -0400
committerAndrew Dunstan <andrew@dunslane.net>2015-07-18 10:11:33 -0400
commitd27fad73e8de2f3f9b68096926735d53d87e7f6a (patch)
treeec199efd7fc4028475e05135b5d95d03d73e96c9
parent0beef5af3a4821155251d8d445b9ba1296381645 (diff)
downloadpostgresql-d27fad73e8de2f3f9b68096926735d53d87e7f6a.tar.gz
postgresql-d27fad73e8de2f3f9b68096926735d53d87e7f6a.zip
Enable transforms modules to build and test on Cygwin.
This still doesn't work correctly with Python 3, but I am committing this so we can get Cygwin buildfarm members building with Python 2.
-rw-r--r--contrib/hstore_plperl/Makefile4
-rw-r--r--contrib/hstore_plpython/Makefile5
-rw-r--r--contrib/ltree_plpython/Makefile5
3 files changed, 14 insertions, 0 deletions
diff --git a/contrib/hstore_plperl/Makefile b/contrib/hstore_plperl/Makefile
index d789b99375a..8f7b171bcd6 100644
--- a/contrib/hstore_plperl/Makefile
+++ b/contrib/hstore_plperl/Makefile
@@ -35,6 +35,10 @@ override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plperl/libperl*.a)
endif
+ifeq ($(PORTNAME), cygwin)
+SHLIB_LINK += -L../hstore -l hstore $(perl_embed_ldflags)
+endif
+
# As with plperl we need to make sure that the CORE directory is included
# last, probably because it sometimes contains some header files with names
# that clash with some of ours, or with some that we include, notably on
diff --git a/contrib/hstore_plpython/Makefile b/contrib/hstore_plpython/Makefile
index 395fc737536..2de00a2c43c 100644
--- a/contrib/hstore_plpython/Makefile
+++ b/contrib/hstore_plpython/Makefile
@@ -33,6 +33,11 @@ ifeq ($(PORTNAME), win32)
SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a)
endif
+ifeq ($(PORTNAME), cygwin)
+SHLIB_LINK += -L../hstore -lhstore -L../../src/pl/plpython \
+ -lplpython$(python_majorversion) $(python_libspec)
+endif
+
REGRESS_OPTS += --load-extension=hstore
ifeq ($(python_majorversion),2)
REGRESS_OPTS += --load-extension=plpythonu --load-extension=hstore_plpythonu
diff --git a/contrib/ltree_plpython/Makefile b/contrib/ltree_plpython/Makefile
index 20b0dcfbc58..7eacb401159 100644
--- a/contrib/ltree_plpython/Makefile
+++ b/contrib/ltree_plpython/Makefile
@@ -33,6 +33,11 @@ ifeq ($(PORTNAME), win32)
SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a)
endif
+ifeq ($(PORTNAME), cygwin)
+SHLIB_LINK += -L../ltree -lltree -L../../src/pl/plpython \
+ -lplpython$(python_majorversion) $(python_libspec)
+endif
+
REGRESS_OPTS += --load-extension=ltree
ifeq ($(python_majorversion),2)
REGRESS_OPTS += --load-extension=plpythonu --load-extension=ltree_plpythonu