mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-07-16 04:21:11 +02:00
dddfc4cb2e
We were being careless in some places about the order of -L switches in link command lines, such that -L switches referring to external directories could come before those referring to directories within the build tree. This made it possible to accidentally link a system-supplied library, for example /usr/lib/libpq.so, in place of the one built in the build tree. Hilarity ensued, the more so the older the system-supplied library is. To fix, break LDFLAGS into two parts, a sub-variable LDFLAGS_INTERNAL and the main LDFLAGS variable, both of which are "recursively expanded" so that they can be incrementally adjusted by different makefiles. Establish a policy that -L switches for directories in the build tree must always be added to LDFLAGS_INTERNAL, while -L switches for external directories must always be added to LDFLAGS. This is sufficient to ensure a safe search order. For simplicity, we typically also put -l switches for the respective libraries into those same variables. (Traditional make usage would have us put -l switches into LIBS, but cleaning that up is a project for another day, as there's no clear need for it.) This turns out to also require separating SHLIB_LINK into two variables, SHLIB_LINK and SHLIB_LINK_INTERNAL, with a similar rule about which switches go into which variable. And likewise for PG_LIBS. Although this change might appear to affect external users of pgxs.mk, I think it doesn't; they shouldn't have any need to touch the _INTERNAL variables. In passing, tweak src/common/Makefile so that the value of CPPFLAGS recorded in pg_config lacks "-DFRONTEND" and the recorded value of LDFLAGS lacks "-L../../../src/common". Both of those things are mistakes, apparently introduced during prior code rearrangements, as old versions of pg_config don't print them. In general we don't want anything that's specific to the src/common subdirectory to appear in those outputs. This is certainly a bug fix, but in view of the lack of field complaints, I'm unsure whether it's worth the risk of back-patching. In any case it seems wise to see what the buildfarm makes of it first. Discussion: https://postgr.es/m/25214.1522604295@sss.pgh.pa.us
42 lines
1.3 KiB
Makefile
42 lines
1.3 KiB
Makefile
# contrib/hstore_plperl/Makefile
|
|
|
|
MODULE_big = hstore_plperl
|
|
OBJS = hstore_plperl.o $(WIN32RES)
|
|
PGFILEDESC = "hstore_plperl - hstore transform for plperl"
|
|
|
|
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -I$(top_srcdir)/contrib/hstore
|
|
|
|
EXTENSION = hstore_plperl hstore_plperlu
|
|
DATA = hstore_plperl--1.0.sql hstore_plperlu--1.0.sql
|
|
|
|
REGRESS = hstore_plperl hstore_plperlu create_transform
|
|
EXTRA_INSTALL = contrib/hstore
|
|
|
|
ifdef USE_PGXS
|
|
PG_CONFIG = pg_config
|
|
PGXS := $(shell $(PG_CONFIG) --pgxs)
|
|
include $(PGXS)
|
|
else
|
|
subdir = contrib/hstore_plperl
|
|
top_builddir = ../..
|
|
include $(top_builddir)/src/Makefile.global
|
|
include $(top_srcdir)/contrib/contrib-global.mk
|
|
endif
|
|
|
|
# We must link libperl explicitly
|
|
ifeq ($(PORTNAME), win32)
|
|
# these settings are the same as for plperl
|
|
override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
|
|
# ... see silliness in plperl Makefile ...
|
|
SHLIB_LINK_INTERNAL += $(sort $(wildcard ../../src/pl/plperl/libperl*.a))
|
|
else
|
|
rpathdir = $(perl_archlibexp)/CORE
|
|
SHLIB_LINK += $(perl_embed_ldflags)
|
|
endif
|
|
|
|
# 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
|
|
# that clash with some of ours, or with some that we include, notably on
|
|
# Windows.
|
|
override CPPFLAGS := $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE
|