mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-07-16 10:11:09 +02:00
d51924be88
Previously, on most platforms, we allowed hstore_plpython's references
to hstore and plpython to be unresolved symbols at link time, trusting
the dynamic linker to resolve them when the module is loaded. This
has a number of problems, the worst being that the dynamic linker
does not know where the references come from and can do nothing but
fail if those other modules haven't been loaded. We've more or less
gotten away with that for the limited use-case of datatype transform
modules, but even there, it requires some awkward hacks, most recently
commit 83c249200.
Instead, let's not treat these references as linker-resolvable at all,
but use function pointers that are manually filled in by the module's
_PG_init function. There are few enough contact points that this
doesn't seem unmaintainable, at least for these use-cases. (Note that
the same technique wouldn't work at all for decoupling from libpython
itself, but fortunately that's just a standard shared library and can
be linked to normally.)
This is an initial patch that just converts hstore_plpython. If the
buildfarm doesn't find any fatal problems, I'll work on the other
transform modules soon.
Tom Lane, per an idea of Andres Freund's.
Discussion: <2652.1475512158@sss.pgh.pa.us>
47 lines
1.4 KiB
Makefile
47 lines
1.4 KiB
Makefile
# contrib/hstore_plpython/Makefile
|
|
|
|
MODULE_big = hstore_plpython$(python_majorversion)
|
|
OBJS = hstore_plpython.o $(WIN32RES)
|
|
PGFILEDESC = "hstore_plpython - hstore transform for plpython"
|
|
|
|
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython $(python_includespec) -I$(top_srcdir)/contrib/hstore -DPLPYTHON_LIBNAME='"plpython$(python_majorversion)"'
|
|
|
|
EXTENSION = hstore_plpythonu hstore_plpython2u hstore_plpython3u
|
|
DATA = hstore_plpythonu--1.0.sql hstore_plpython2u--1.0.sql hstore_plpython3u--1.0.sql
|
|
|
|
REGRESS = hstore_plpython
|
|
REGRESS_PLPYTHON3_MANGLE := $(REGRESS)
|
|
|
|
ifdef USE_PGXS
|
|
PG_CONFIG = pg_config
|
|
PGXS := $(shell $(PG_CONFIG) --pgxs)
|
|
include $(PGXS)
|
|
else
|
|
subdir = contrib/hstore_plpython
|
|
top_builddir = ../..
|
|
include $(top_builddir)/src/Makefile.global
|
|
include $(top_srcdir)/contrib/contrib-global.mk
|
|
endif
|
|
|
|
# We must link libpython explicitly
|
|
ifeq ($(PORTNAME), aix)
|
|
rpathdir = $(pkglibdir):$(python_libdir)
|
|
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
|
|
else
|
|
ifeq ($(PORTNAME), win32)
|
|
# ... see silliness in plpython Makefile ...
|
|
SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
|
|
else
|
|
rpathdir = $(python_libdir)
|
|
SHLIB_LINK += $(python_libspec)
|
|
endif
|
|
endif
|
|
|
|
REGRESS_OPTS += --load-extension=hstore
|
|
ifeq ($(python_majorversion),2)
|
|
REGRESS_OPTS += --load-extension=plpythonu --load-extension=hstore_plpythonu
|
|
endif
|
|
EXTRA_INSTALL += contrib/hstore
|
|
|
|
include $(top_srcdir)/src/pl/plpython/regress-python3-mangle.mk
|