diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2015-05-03 09:10:47 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2015-05-03 09:10:47 -0400 |
| commit | f802c6ddba143bd88512b5fc34e84ae0b4883284 (patch) | |
| tree | b2ddb0a842ce440911aebf7047bad98eb8b5879b /contrib/ltree_plpython | |
| parent | b6b2149e48aa61981ae0199c963d5145a37c258c (diff) | |
| download | postgresql-f802c6ddba143bd88512b5fc34e84ae0b4883284.tar.gz postgresql-f802c6ddba143bd88512b5fc34e84ae0b4883284.zip | |
Enable transforms modules to build and run with Mingw builds.
These modules were all missing essential Windows scaffolding, including
resources files and descriptions, and links to the relevant library
import files. This latter item means that the modules can't be built
with pgxs on Windows, as we don't install the import files. If we ever
decide to install them this restriction could probably be removed.
Also, as with plperl we need to make sure that perl's CORE directory is
last on the include list, as on Windows it appears to contain some
headers with names that clash with names of some headers we include.
Diffstat (limited to 'contrib/ltree_plpython')
| -rw-r--r-- | contrib/ltree_plpython/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/ltree_plpython/Makefile b/contrib/ltree_plpython/Makefile index c358cfa88b2..a0c107c2c32 100644 --- a/contrib/ltree_plpython/Makefile +++ b/contrib/ltree_plpython/Makefile @@ -1,7 +1,8 @@ # contrib/ltree_plpython/Makefile MODULE_big = ltree_plpython$(python_majorversion) -OBJS = ltree_plpython.o +OBJS = ltree_plpython.o $(WIN32RES) +PGFILEDESC = "ltree_plpython - ltree transform for plpython" PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython $(python_includespec) -I$(top_srcdir)/contrib/ltree @@ -22,6 +23,11 @@ include $(top_builddir)/src/Makefile.global include $(top_srcdir)/contrib/contrib-global.mk endif +ifeq ($(PORTNAME), win32) +# This means we need an in-tree build on Windows, not a pgxs build +SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython*.a) +endif + REGRESS_OPTS = --load-extension=ltree ifeq ($(python_majorversion),2) REGRESS_OPTS += --load-extension=plpythonu --load-extension=ltree_plpythonu |