Commit 00eff86c authored by Andrew Dunstan's avatar Andrew Dunstan

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.
parent 47386504
...@@ -35,6 +35,10 @@ override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment ...@@ -35,6 +35,10 @@ override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plperl/libperl*.a) SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plperl/libperl*.a)
endif 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 # 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 # 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 # that clash with some of ours, or with some that we include, notably on
......
...@@ -33,6 +33,11 @@ ifeq ($(PORTNAME), win32) ...@@ -33,6 +33,11 @@ ifeq ($(PORTNAME), win32)
SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a) SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a)
endif endif
ifeq ($(PORTNAME), cygwin)
SHLIB_LINK += -L../hstore -lhstore -L../../src/pl/plpython \
-lplpython$(python_majorversion) $(python_libspec)
endif
REGRESS_OPTS += --load-extension=hstore REGRESS_OPTS += --load-extension=hstore
ifeq ($(python_majorversion),2) ifeq ($(python_majorversion),2)
REGRESS_OPTS += --load-extension=plpythonu --load-extension=hstore_plpythonu REGRESS_OPTS += --load-extension=plpythonu --load-extension=hstore_plpythonu
......
...@@ -33,6 +33,11 @@ ifeq ($(PORTNAME), win32) ...@@ -33,6 +33,11 @@ ifeq ($(PORTNAME), win32)
SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a) SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a)
endif endif
ifeq ($(PORTNAME), cygwin)
SHLIB_LINK += -L../ltree -lltree -L../../src/pl/plpython \
-lplpython$(python_majorversion) $(python_libspec)
endif
REGRESS_OPTS += --load-extension=ltree REGRESS_OPTS += --load-extension=ltree
ifeq ($(python_majorversion),2) ifeq ($(python_majorversion),2)
REGRESS_OPTS += --load-extension=plpythonu --load-extension=ltree_plpythonu REGRESS_OPTS += --load-extension=plpythonu --load-extension=ltree_plpythonu
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment