]> granicus.if.org Git - postgresql/commitdiff
Enable transforms modules to build and test on Cygwin.
authorAndrew Dunstan <andrew@dunslane.net>
Sat, 18 Jul 2015 14:09:04 +0000 (10:09 -0400)
committerAndrew Dunstan <andrew@dunslane.net>
Sat, 18 Jul 2015 14:11:33 +0000 (10:11 -0400)
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.

contrib/hstore_plperl/Makefile
contrib/hstore_plpython/Makefile
contrib/ltree_plpython/Makefile

index d789b99375af0af6edd733b561f3c2fcdf435df7..8f7b171bcd611abc68f28dcecc9212ea87a4b536 100644 (file)
@@ -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
index 395fc7375368f75dfdd3d414d846cae61ad88e66..2de00a2c43c9ce83a34787a2f086a487ae5f78d8 100644 (file)
@@ -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
index 20b0dcfbc587239c7abbd6dd1b45fea07886a230..7eacb40115944deb4647b621f0c07d303074deae 100644 (file)
@@ -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