database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

Avoid direct cross-module links in hstore_plperl and ltree_plpython, too.

Browse Source 
Just turning the crank on the project started in commit d51924be8.
These cases turn out to be exact subsets of the boilerplate needed
for hstore_plpython.

Discussion: <2652.1475512158@sss.pgh.pa.us>
This commit is contained in:
Tom Lane
2016-10-04 17:49:07 -04:00
parent fc76259f5b
commit eda04886c1
10 changed files with 102 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/ltree_plpython/Makefile
View File

@ -4,7 +4,7 @@ MODULE_big = ltree_plpython$(python_majorversion)
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
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython $(python_includespec) -I$(top_srcdir)/contrib/ltree -DPLPYTHON_LIBNAME='"plpython$(python_majorversion)"'
EXTENSION = ltree_plpythonu ltree_plpython2u ltree_plpython3u
DATA = ltree_plpythonu--1.0.sql ltree_plpython2u--1.0.sql ltree_plpython3u--1.0.sql
@ -23,19 +23,18 @@ include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif
# In configurations that forbid undefined symbols in libraries, link with each
# dependency. This does preclude pgxs builds.
# We must link libpython explicitly
ifeq ($(PORTNAME), aix)
rpathdir = $(pkglibdir):$(python_libdir)
SHLIB_LINK += $(python_libspec) $(python_additional_libs) $(sort $(wildcard ../../src/pl/plpython/libplpython*.exp))
endif
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
else
ifeq ($(PORTNAME), win32)
SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a)) $(sort $(wildcard ../../src/pl/plpython/libplpython*.a))
# ... see silliness in plpython Makefile ...
SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
else
rpathdir = $(python_libdir)
SHLIB_LINK += $(python_libspec)
endif
ifeq ($(PORTNAME), cygwin)
SHLIB_LINK += -L../ltree -lltree -L../../src/pl/plpython \
-lplpython$(python_majorversion) $(python_libspec)
endif
REGRESS_OPTS += --load-extension=ltree