mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-18 18:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Code review for avoidance of direct cross-module links.

Browse Source 
Remove $(pkglibdir) from $(rpathdir), since commits
d51924be88 and
eda04886c1 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.
This commit is contained in:
Noah Misch 2017-02-02 11:21:16 -05:00
parent 53dd2da257
commit acd73ad1a1
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/hstore_plperl/Makefile
View File

@ -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
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

7
contrib/hstore_plpython/Makefile
View File

@ -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

7
contrib/ltree_plpython/Makefile
View File

@ -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