Commit acd73ad1 authored by Noah Misch's avatar Noah Misch

Code review for avoidance of direct cross-module links.

Remove $(pkglibdir) from $(rpathdir), since commits
d51924be and
eda04886 removed direct linkage to
objects stored there.  Users are unlikely to notice the difference.
Accompany every $(python_libspec) with $(python_additional_libs); this
doesn't fix a demonstrated bug, but it might do so on rare Python
configurations.  With these changes, AIX ceases to be a special case.
parent 53dd2da2
...@@ -24,10 +24,6 @@ include $(top_srcdir)/contrib/contrib-global.mk ...@@ -24,10 +24,6 @@ include $(top_srcdir)/contrib/contrib-global.mk
endif endif
# We must link libperl explicitly # We must link libperl explicitly
ifeq ($(PORTNAME), aix)
rpathdir = $(pkglibdir):$(perl_archlibexp)/CORE
SHLIB_LINK += $(perl_embed_ldflags)
else
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
# these settings are the same as for plperl # these settings are the same as for plperl
override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
...@@ -37,7 +33,6 @@ else ...@@ -37,7 +33,6 @@ else
rpathdir = $(perl_archlibexp)/CORE rpathdir = $(perl_archlibexp)/CORE
SHLIB_LINK += $(perl_embed_ldflags) SHLIB_LINK += $(perl_embed_ldflags)
endif endif
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
......
...@@ -24,17 +24,12 @@ include $(top_srcdir)/contrib/contrib-global.mk ...@@ -24,17 +24,12 @@ include $(top_srcdir)/contrib/contrib-global.mk
endif endif
# We must link libpython explicitly # We must link libpython explicitly
ifeq ($(PORTNAME), aix)
rpathdir = $(pkglibdir):$(python_libdir)
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
else
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
# ... see silliness in plpython Makefile ... # ... see silliness in plpython Makefile ...
SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a)) SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
else else
rpathdir = $(python_libdir) rpathdir = $(python_libdir)
SHLIB_LINK += $(python_libspec) SHLIB_LINK += $(python_libspec) $(python_additional_libs)
endif
endif endif
REGRESS_OPTS += --load-extension=hstore REGRESS_OPTS += --load-extension=hstore
......
...@@ -24,17 +24,12 @@ include $(top_srcdir)/contrib/contrib-global.mk ...@@ -24,17 +24,12 @@ include $(top_srcdir)/contrib/contrib-global.mk
endif endif
# We must link libpython explicitly # We must link libpython explicitly
ifeq ($(PORTNAME), aix)
rpathdir = $(pkglibdir):$(python_libdir)
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
else
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
# ... see silliness in plpython Makefile ... # ... see silliness in plpython Makefile ...
SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a)) SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
else else
rpathdir = $(python_libdir) rpathdir = $(python_libdir)
SHLIB_LINK += $(python_libspec) SHLIB_LINK += $(python_libspec) $(python_additional_libs)
endif
endif endif
REGRESS_OPTS += --load-extension=ltree REGRESS_OPTS += --load-extension=ltree
......
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