Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf802c6d

Browse files
committed
Enable transforms modules to build and run with Mingw builds.
These modules were all missing essential Windows scaffolding, includingresources files and descriptions, and links to the relevant libraryimport files. This latter item means that the modules can't be builtwith pgxs on Windows, as we don't install the import files. If we everdecide to install them this restriction could probably be removed.Also, as with plperl we need to make sure that perl's CORE directory islast on the include list, as on Windows it appears to contain someheaders with names that clash with names of some headers we include.
1 parentb6b2149 commitf802c6d

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

‎contrib/hstore_plperl/Makefile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# contrib/hstore_plperl/Makefile
22

33
MODULE_big = hstore_plperl
4-
OBJS = hstore_plperl.o
4+
OBJS = hstore_plperl.o$(WIN32RES)
5+
PGFILEDESC = "hstore_plperl - hstore transform for plperl"
56

6-
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -I$(top_srcdir)/contrib/hstore -I$(perl_archlibexp)/CORE
7+
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -I$(top_srcdir)/contrib/hstore
78

89
EXTENSION = hstore_plperl hstore_plperlu
910
DATA = hstore_plperl--1.0.sql hstore_plperlu--1.0.sql
@@ -22,7 +23,15 @@ include $(top_builddir)/src/Makefile.global
2223
include$(top_srcdir)/contrib/contrib-global.mk
2324
endif
2425

25-
# see plperl
2626
ifeq ($(PORTNAME), win32)
27+
# these settings are the same as for plperl
2728
overrideCPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
29+
# This means we need an in-tree build on Windows, not a pgxs build
30+
SHLIB_LINK += ../hstore/libhstore.a$(wildcard ../../src/pl/plperl/libperl*.a)
2831
endif
32+
33+
# As with plperl we need to make sure that the CORE directory is included
34+
# last, probably because it sometimes contains some header files with names
35+
# that clash with some of ours, or with some that we include, notably on
36+
# Windows.
37+
overrideCPPFLAGS :=$(CPPFLAGS) -I$(perl_archlibexp)/CORE

‎contrib/hstore_plpython/Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# contrib/hstore_plpython/Makefile
22

33
MODULE_big = hstore_plpython$(python_majorversion)
4-
OBJS = hstore_plpython.o
4+
OBJS = hstore_plpython.o$(WIN32RES)
5+
PGFILEDESC = "hstore_plpython - hstore transform for plpython"
56

67
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython$(python_includespec) -I$(top_srcdir)/contrib/hstore
78

@@ -22,6 +23,11 @@ include $(top_builddir)/src/Makefile.global
2223
include$(top_srcdir)/contrib/contrib-global.mk
2324
endif
2425

26+
ifeq ($(PORTNAME), win32)
27+
# This means we need an in-tree build on Windows, not a pgxs build
28+
SHLIB_LINK += ../hstore/libhstore.a$(wildcard ../../src/pl/plpython/libpython*.a)$(wildcard ../../src/pl/plpython/libplpython*.a)
29+
endif
30+
2531
REGRESS_OPTS = --load-extension=hstore
2632
ifeq ($(python_majorversion),2)
2733
REGRESS_OPTS += --load-extension=plpythonu --load-extension=hstore_plpythonu

‎contrib/ltree_plpython/Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# contrib/ltree_plpython/Makefile
22

33
MODULE_big = ltree_plpython$(python_majorversion)
4-
OBJS = ltree_plpython.o
4+
OBJS = ltree_plpython.o$(WIN32RES)
5+
PGFILEDESC = "ltree_plpython - ltree transform for plpython"
56

67
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython$(python_includespec) -I$(top_srcdir)/contrib/ltree
78

@@ -22,6 +23,11 @@ include $(top_builddir)/src/Makefile.global
2223
include$(top_srcdir)/contrib/contrib-global.mk
2324
endif
2425

26+
ifeq ($(PORTNAME), win32)
27+
# This means we need an in-tree build on Windows, not a pgxs build
28+
SHLIB_LINK +=$(wildcard ../../src/pl/plpython/libpython*.a)
29+
endif
30+
2531
REGRESS_OPTS = --load-extension=ltree
2632
ifeq ($(python_majorversion),2)
2733
REGRESS_OPTS += --load-extension=plpythonu --load-extension=ltree_plpythonu

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp