Skip to content

Commit ccc286d

Browse files
tglsfdctglsfdc
committed
Prevent accidental linking of system-supplied copies of libpq.so etc.
Back-patch commit dddfc4c, which broke LDFLAGS and related Makefile variables into two parts, one for within-build-tree library references and one for external libraries, to ensure that the order of -L flags has all of the former before all of the latter. This turns out to fix a problem recently noted on buildfarm member peripatus, that we attempted to incorporate code from libpgport.a into a shared library. That will fail on platforms that are sticky about putting non-PIC code into shared libraries. (It's quite surprising we hadn't seen such failures before, since the code in question has been like that for a long time.) I think that peripatus' problem could have been fixed with just a subset of this patch; but since the previous issue of accidentally linking to the wrong copy of a Postgres shlib seems likely to bite people in the field, let's just back-patch the whole change. Now that commit dddfc4c has survived some beta testing, I'm less afraid to back-patch it than I was at the time. This also fixes undesired inclusion of "-DFRONTEND" in pg_config's CPPFLAGS output (in 9.6 and up) and undesired inclusion of "-L../../src/common" in its LDFLAGS output (in all supported branches). Back-patch to v10 and older branches; this is already in v11. Discussion: https://postgr.es/m/20180704234304.bq2dxispefl65odz@ler-imac.local
1 parent 619dea4 commit ccc286d

File tree

29 files changed

+81
-56
lines changed

29 files changed

+81
-56
lines changed

‎contrib/dblink/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
MODULE_big = dblink
44
OBJS = dblink.o $(WIN32RES)
55
PG_CPPFLAGS = -I$(libpq_srcdir)
6-
SHLIB_LINK = $(libpq)
6+
SHLIB_LINK_INTERNAL = $(libpq)
77

88
EXTENSION = dblink
99
DATA = dblink--1.2.sql dblink--1.1--1.2.sql dblink--1.0--1.1.sql \

‎contrib/hstore_plperl/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,18 @@ endif
2727
# dependency. This does preclude pgxs builds.
2828
ifeq ($(PORTNAME), aix)
2929
rpathdir = $(pkglibdir):$(perl_archlibexp)/CORE
30-
SHLIB_LINK += ../hstore/libhstore.exp $(perl_embed_ldflags)
30+
SHLIB_LINK_INTERNAL += ../hstore/libhstore.exp
31+
SHLIB_LINK += $(perl_embed_ldflags)
3132
endif
3233
ifeq ($(PORTNAME), win32)
3334
# these settings are the same as for plperl
3435
override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
35-
SHLIB_LINK += ../hstore/libhstore.a $(sort $(wildcard ../../src/pl/plperl/libperl*.a))
36+
SHLIB_LINK_INTERNAL += ../hstore/libhstore.a $(sort $(wildcard ../../src/pl/plperl/libperl*.a))
3637
endif
3738

3839
ifeq ($(PORTNAME), cygwin)
39-
SHLIB_LINK += -L../hstore -l hstore $(perl_embed_ldflags)
40+
SHLIB_LINK_INTERNAL += -L../hstore -l hstore
41+
SHLIB_LINK += $(perl_embed_ldflags)
4042
endif
4143

4244
# As with plperl we need to make sure that the CORE directory is included

‎contrib/hstore_plpython/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,17 @@ endif
2727
# dependency. This does preclude pgxs builds.
2828
ifeq ($(PORTNAME), aix)
2929
rpathdir = $(pkglibdir):$(python_libdir)
30-
SHLIB_LINK += ../hstore/libhstore.exp $(python_libspec) $(python_additional_libs) $(sort $(wildcard ../../src/pl/plpython/libplpython*.exp))
30+
SHLIB_LINK_INTERNAL += ../hstore/libhstore.exp $(sort $(wildcard ../../src/pl/plpython/libplpython*.exp))
31+
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
3132
endif
3233
ifeq ($(PORTNAME), win32)
33-
SHLIB_LINK += ../hstore/libhstore.a $(sort $(wildcard ../../src/pl/plpython/libpython*.a)) $(sort $(wildcard ../../src/pl/plpython/libplpython*.a))
34+
SHLIB_LINK_INTERNAL += ../hstore/libhstore.a $(sort $(wildcard ../../src/pl/plpython/libplpython*.a)) $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
3435
endif
3536

3637
ifeq ($(PORTNAME), cygwin)
37-
SHLIB_LINK += -L../hstore -lhstore -L../../src/pl/plpython \
38-
-lplpython$(python_majorversion) $(python_libspec)
38+
SHLIB_LINK_INTERNAL += -L../hstore -lhstore -L../../src/pl/plpython \
39+
-lplpython$(python_majorversion)
40+
SHLIB_LINK += $(python_libspec)
3941
endif
4042

4143
REGRESS_OPTS += --load-extension=hstore

‎contrib/ltree_plpython/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,17 @@ endif
2727
# dependency. This does preclude pgxs builds.
2828
ifeq ($(PORTNAME), aix)
2929
rpathdir = $(pkglibdir):$(python_libdir)
30-
SHLIB_LINK += $(python_libspec) $(python_additional_libs) $(sort $(wildcard ../../src/pl/plpython/libplpython*.exp))
30+
SHLIB_LINK_INTERNAL += $(sort $(wildcard ../../src/pl/plpython/libplpython*.exp))
31+
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
3132
endif
3233
ifeq ($(PORTNAME), win32)
33-
SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a)) $(sort $(wildcard ../../src/pl/plpython/libplpython*.a))
34+
SHLIB_LINK_INTERNAL += $(sort $(wildcard ../../src/pl/plpython/libplpython*.a)) $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
3435
endif
3536

3637
ifeq ($(PORTNAME), cygwin)
37-
SHLIB_LINK += -L../ltree -lltree -L../../src/pl/plpython \
38-
-lplpython$(python_majorversion) $(python_libspec)
38+
SHLIB_LINK_INTERNAL += -L../ltree -lltree -L../../src/pl/plpython \
39+
-lplpython$(python_majorversion)
40+
SHLIB_LINK += $(python_libspec)
3941
endif
4042

4143
REGRESS_OPTS += --load-extension=ltree

‎contrib/oid2name/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PROGRAM = oid2name
77
OBJS = oid2name.o $(WIN32RES)
88

99
PG_CPPFLAGS = -I$(libpq_srcdir)
10-
PG_LIBS = $(libpq_pgport)
10+
PG_LIBS_INTERNAL = $(libpq_pgport)
1111

1212
ifdef USE_PGXS
1313
PG_CONFIG = pg_config

‎contrib/postgres_fdw/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ OBJS = postgres_fdw.o option.o deparse.o connection.o shippable.o $(WIN32RES)
55
PGFILEDESC = "postgres_fdw - foreign data wrapper for PostgreSQL"
66

77
PG_CPPFLAGS = -I$(libpq_srcdir)
8-
SHLIB_LINK = $(libpq)
8+
SHLIB_LINK_INTERNAL = $(libpq)
99

1010
EXTENSION = postgres_fdw
1111
DATA = postgres_fdw--1.0.sql

‎contrib/spi/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ DOCS = $(addsuffix .example, $(MODULES))
1717
# comment out if you want a quieter refint package for other uses
1818
PG_CPPFLAGS = -DREFINT_VERBOSE
1919

20-
LDFLAGS_SL += -L$(top_builddir)/src/port -lpgport
21-
2220
ifdef USE_PGXS
2321
PG_CONFIG = pg_config
2422
PGXS := $(shell $(PG_CONFIG) --pgxs)

‎contrib/vacuumlo/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PROGRAM = vacuumlo
77
OBJS = vacuumlo.o $(WIN32RES)
88

99
PG_CPPFLAGS = -I$(libpq_srcdir)
10-
PG_LIBS = $(libpq_pgport)
10+
PG_LIBS_INTERNAL = $(libpq_pgport)
1111

1212
ifdef USE_PGXS
1313
PG_CONFIG = pg_config

‎src/Makefile.global.in

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,26 @@ LD = @LD@
267267
with_gnu_ld = @with_gnu_ld@
268268
ld_R_works = @ld_R_works@
269269

270-
# We want -L for libpgport.a and libpgcommon.a to be first in LDFLAGS. We
271-
# also need LDFLAGS to be a "recursively expanded" variable, else adjustments
272-
# to rpathdir don't work right. So we must NOT do LDFLAGS := something,
273-
# meaning this has to be done first and elsewhere we must only do LDFLAGS +=
274-
# something.
270+
# It's critical that within LDFLAGS, all -L switches pointing to build-tree
271+
# directories come before any -L switches pointing to external directories.
272+
# Otherwise it's possible for, e.g., a platform-provided copy of libpq.so
273+
# to get linked in place of the one we've built. Therefore we adopt the
274+
# convention that the first component of LDFLAGS is an extra variable
275+
# LDFLAGS_INTERNAL, and -L and -l switches for PG's own libraries must be
276+
# put into LDFLAGS_INTERNAL, so they will appear ahead of those for external
277+
# libraries.
278+
#
279+
# We need LDFLAGS and LDFLAGS_INTERNAL to be "recursively expanded" variables,
280+
# else adjustments to, e.g., rpathdir don't work right. So we must NOT do
281+
# "LDFLAGS := something" anywhere, ditto for LDFLAGS_INTERNAL.
282+
# These initial assignments must be "=" type, and elsewhere we must only do
283+
# "LDFLAGS += something" or "LDFLAGS_INTERNAL += something".
275284
ifdef PGXS
276-
LDFLAGS = -L$(libdir)
285+
LDFLAGS_INTERNAL = -L$(libdir)
277286
else
278-
LDFLAGS = -L$(top_builddir)/src/port -L$(top_builddir)/src/common
287+
LDFLAGS_INTERNAL = -L$(top_builddir)/src/port -L$(top_builddir)/src/common
279288
endif
280-
LDFLAGS += @LDFLAGS@
289+
LDFLAGS = $(LDFLAGS_INTERNAL) @LDFLAGS@
281290

282291
LDFLAGS_EX = @LDFLAGS_EX@
283292
# LDFLAGS_SL might have already been assigned by calling makefile

‎src/Makefile.shlib

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@
2020
#
2121
# NAME Name of library to build (no suffix nor "lib" prefix)
2222
# OBJS List of object files to include in library
23-
# SHLIB_LINK If shared library relies on other libraries,
24-
# additional stuff to put in its link command
23+
# SHLIB_LINK Stuff to append to library's link command
24+
# (typically, -L and -l switches for external libraries)
25+
# SHLIB_LINK_INTERNAL -L and -l switches for Postgres-supplied libraries
2526
# SHLIB_PREREQS Order-only prerequisites for library build target
2627
# SHLIB_EXPORTS (optional) Name of file containing list of symbols to
2728
# export, in the format "function_name number"
2829
#
30+
# Don't use SHLIB_LINK for references to files in the build tree, or the
31+
# wrong things will happen --- use SHLIB_LINK_INTERNAL for those!
32+
#
2933
# When building a shared library, the following version information
3034
# must also be set. It should be omitted when building a dynamically
3135
# loadable module.
@@ -70,6 +74,8 @@
7074
COMPILER = $(CC) $(CFLAGS)
7175
LINK.static = $(AR) $(AROPT)
7276

77+
LDFLAGS_INTERNAL += $(SHLIB_LINK_INTERNAL)
78+
7379

7480

7581
ifdef SO_MAJOR_VERSION

‎src/backend/replication/libpqwalreceiver/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ include $(top_builddir)/src/Makefile.global
1515
override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
1616

1717
OBJS = libpqwalreceiver.o $(WIN32RES)
18-
SHLIB_LINK = $(libpq) $(filter -lintl, $(LIBS))
18+
SHLIB_LINK_INTERNAL = $(libpq)
19+
SHLIB_LINK = $(filter -lintl, $(LIBS))
1920
SHLIB_PREREQS = submake-libpq
2021
PGFILEDESC = "libpqwalreceiver - receive WAL during streaming replication"
2122
NAME = libpqwalreceiver

‎src/bin/pg_basebackup/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@ top_builddir = ../../..
1717
include $(top_builddir)/src/Makefile.global
1818

1919
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
20+
LDFLAGS_INTERNAL += $(libpq_pgport)
2021

2122
OBJS=receivelog.o streamutil.o $(WIN32RES)
2223

2324
all: pg_basebackup pg_receivexlog pg_recvlogical
2425

2526
pg_basebackup: pg_basebackup.o $(OBJS) | submake-libpq submake-libpgport
26-
$(CC) $(CFLAGS) pg_basebackup.o $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
27+
$(CC) $(CFLAGS) pg_basebackup.o $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
2728

2829
pg_receivexlog: pg_receivexlog.o $(OBJS) | submake-libpq submake-libpgport
29-
$(CC) $(CFLAGS) pg_receivexlog.o $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
30+
$(CC) $(CFLAGS) pg_receivexlog.o $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
3031

3132
pg_recvlogical: pg_recvlogical.o $(OBJS) | submake-libpq submake-libpgport
32-
$(CC) $(CFLAGS) pg_recvlogical.o $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
33+
$(CC) $(CFLAGS) pg_recvlogical.o $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
3334

3435
install: all installdirs
3536
$(INSTALL_PROGRAM) pg_basebackup$(X) '$(DESTDIR)$(bindir)/pg_basebackup$(X)'

‎src/bin/pg_ctl/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ top_builddir = ../../..
1717
include $(top_builddir)/src/Makefile.global
1818

1919
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
20+
LDFLAGS_INTERNAL += $(libpq_pgport)
2021

2122
OBJS= pg_ctl.o $(WIN32RES)
2223

2324
all: pg_ctl
2425

2526
pg_ctl: $(OBJS) | submake-libpq submake-libpgport
26-
$(CC) $(CFLAGS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
27+
$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
2728

2829
install: all installdirs
2930
$(INSTALL_PROGRAM) pg_ctl$(X) '$(DESTDIR)$(bindir)/pg_ctl$(X)'

‎src/bin/pg_dump/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ top_builddir = ../../..
1717
include $(top_builddir)/src/Makefile.global
1818

1919
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
20-
override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS)
20+
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
2121

2222
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
2323
pg_backup_null.o pg_backup_tar.o pg_backup_directory.o \

‎src/bin/pg_rewind/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ top_builddir = ../../..
1616
include $(top_builddir)/src/Makefile.global
1717

1818
override CPPFLAGS := -I$(libpq_srcdir) -DFRONTEND $(CPPFLAGS)
19-
override LDFLAGS := $(libpq_pgport) $(LDFLAGS)
19+
LDFLAGS_INTERNAL += $(libpq_pgport)
2020

2121
OBJS = pg_rewind.o parsexlog.o xlogreader.o datapagemap.o timeline.o \
2222
fetch.o file_ops.o copy_fetch.o libpq_fetch.o filemap.o logging.o \

‎src/bin/pg_upgrade/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
1212
tablespace.o util.o version.o $(WIN32RES)
1313

1414
override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
15-
override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS)
15+
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
1616

1717

1818
all: pg_upgrade

‎src/bin/pgbench/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ include $(top_builddir)/src/Makefile.global
1010
OBJS = pgbench.o exprparse.o $(WIN32RES)
1111

1212
override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
13-
override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS)
13+
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
1414

1515
ifneq ($(PORTNAME), win32)
1616
override CFLAGS += $(PTHREAD_CFLAGS)

‎src/bin/psql/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global
1919
REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
2020

2121
override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
22-
override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS)
22+
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
2323

2424
OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
2525
startup.o prompt.o variables.o large_obj.o describe.o \

‎src/bin/scripts/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global
1919
PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb reindexdb pg_isready
2020

2121
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
22-
override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS)
22+
LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
2323

2424
all: $(PROGRAMS)
2525

‎src/common/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,9 @@ subdir = src/common
2020
top_builddir = ../..
2121
include $(top_builddir)/src/Makefile.global
2222

23-
override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
24-
LIBS += $(PTHREAD_LIBS)
25-
2623
# don't include subdirectory-path-dependent -I and -L switches
2724
STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
28-
STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
25+
STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
2926
override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
3027
override CPPFLAGS += -DVAL_CC="\"$(CC)\""
3128
override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
@@ -36,6 +33,9 @@ override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
3633
override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
3734
override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
3835

36+
override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
37+
LIBS += $(PTHREAD_LIBS)
38+
3939
OBJS_COMMON = config_info.o controldata_utils.o exec.o keywords.o \
4040
pg_lzcompress.o pgfnames.o psprintf.o relpath.o rmtree.o \
4141
string.o username.o wait_error.o

‎src/interfaces/ecpg/compatlib/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
2222
-I$(libpq_srcdir) -DFRONTEND $(CPPFLAGS)
2323
override CFLAGS += $(PTHREAD_CFLAGS)
2424

25-
SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) \
26-
$(filter -lintl -lm, $(LIBS)) $(PTHREAD_LIBS)
25+
SHLIB_LINK_INTERNAL = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq)
26+
SHLIB_LINK = $(filter -lintl -lm, $(LIBS)) $(PTHREAD_LIBS)
2727
SHLIB_PREREQS = submake-ecpglib submake-pgtypeslib
2828

2929
SHLIB_EXPORTS = exports.txt

‎src/interfaces/ecpg/ecpglib/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ ifneq ($(PORTNAME), win32)
3434
OBJS += thread.o
3535
endif
3636

37-
SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) $(filter -lintl -lm, $(LIBS)) $(PTHREAD_LIBS)
37+
SHLIB_LINK_INTERNAL = -L../pgtypeslib -lpgtypes $(libpq)
38+
SHLIB_LINK = $(filter -lintl -lm, $(LIBS)) $(PTHREAD_LIBS)
3839
SHLIB_PREREQS = submake-libpq submake-pgtypeslib
3940

4041
SHLIB_EXPORTS = exports.txt

‎src/interfaces/ecpg/pgtypeslib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)
2525
# Need to recompile any libpgport object files
2626
LIBS := $(filter-out -lpgport, $(LIBS))
2727

28-
SHLIB_LINK += -lm
28+
SHLIB_LINK += $(filter -lm, $(LIBS))
2929

3030
SHLIB_EXPORTS = exports.txt
3131

‎src/interfaces/ecpg/test/Makefile.regress

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ override CPPFLAGS := -I../../include -I$(top_srcdir)/src/interfaces/ecpg/include
55
-I$(libpq_srcdir) $(CPPFLAGS)
66
override CFLAGS += $(PTHREAD_CFLAGS)
77

8-
override LDFLAGS := -L../../ecpglib -L../../pgtypeslib $(filter-out -l%, $(libpq)) $(LDFLAGS)
9-
override LIBS := -lecpg -lpgtypes $(filter -l%, $(libpq)) $(LIBS) $(PTHREAD_LIBS)
8+
LDFLAGS_INTERNAL += -L../../ecpglib -lecpg -L../../pgtypeslib -lpgtypes $(libpq)
9+
10+
override LIBS += $(PTHREAD_LIBS)
1011

1112
# Standard way to invoke the ecpg preprocessor
1213
ECPG = ../../preproc/ecpg --regression -I$(srcdir)/../../include -I$(srcdir)

‎src/interfaces/ecpg/test/compat_informix/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ include $(top_srcdir)/$(subdir)/../Makefile.regress
66
# Use special informix compatibility switch for all tests in this directory
77
ECPG += -C INFORMIX
88

9-
override LDFLAGS := -L../../compatlib $(LDFLAGS)
10-
override LIBS := -lecpg_compat $(LIBS)
9+
LDFLAGS_INTERNAL += -L../../compatlib -lecpg_compat
1110

1211
TESTS = test_informix test_informix.c \
1312
test_informix2 test_informix2.c \

‎src/interfaces/libpq/test/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ top_builddir = ../../../..
33
include $(top_builddir)/src/Makefile.global
44

55
ifeq ($(PORTNAME), win32)
6-
LDLIBS += -lws2_32
6+
LDFLAGS += -lws2_32
77
endif
88

99
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
10-
override LDLIBS := $(libpq_pgport) $(LDLIBS)
10+
LDFLAGS_INTERNAL += $(libpq_pgport)
1111

1212
PROGS = uri-regress
1313

‎src/makefiles/pgxs.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
# EXTRA_CLEAN -- extra files to remove in 'make clean'
4444
# PG_CPPFLAGS -- will be added to CPPFLAGS
4545
# PG_LIBS -- will be added to PROGRAM link line
46+
# PG_LIBS_INTERNAL -- same, for references to libraries within build tree
4647
# SHLIB_LINK -- will be added to MODULE_big link line
48+
# SHLIB_LINK_INTERNAL -- same, for references to libraries within build tree
4749
# PG_CONFIG -- path to pg_config program for the PostgreSQL installation
4850
# to build against (typically just "pg_config" to use the first one in
4951
# your PATH)
@@ -293,5 +295,5 @@ endif
293295

294296
ifdef PROGRAM
295297
$(PROGRAM): $(OBJS)
296-
$(CC) $(CFLAGS) $(OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
298+
$(CC) $(CFLAGS) $(OBJS) $(PG_LIBS_INTERNAL) $(LDFLAGS) $(LDFLAGS_EX) $(PG_LIBS) $(LIBS) -o $@$(X)
297299
endif

‎src/test/examples/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ top_builddir = ../../..
77
include $(top_builddir)/src/Makefile.global
88

99
ifeq ($(PORTNAME), win32)
10-
LDLIBS += -lws2_32
10+
LDFLAGS += -lws2_32
1111
endif
1212

1313
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
14-
override LDLIBS := $(libpq_pgport) $(LDLIBS)
14+
LDFLAGS_INTERNAL += $(libpq_pgport)
1515

1616

1717
PROGS = testlibpq testlibpq2 testlibpq3 testlibpq4 testlo testlo64

0 commit comments

Comments
 (0)