aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2020-03-31 14:17:32 -0400
committerBruce Momjian <bruce@momjian.us>2020-03-31 14:17:32 -0400
commit051fd5e0f99b14d7bd76fb800bd077bf394fecd5 (patch)
treeb942493326a1839d52ea05c6a4c3b1e508e35c85
parent82e801852274e46492b0e160624a850157c677e4 (diff)
downloadpostgresql-051fd5e0f99b14d7bd76fb800bd077bf394fecd5.tar.gz
postgresql-051fd5e0f99b14d7bd76fb800bd077bf394fecd5.zip
Allow ecpg to be built stand-alone, allow parallel libpq make
This change defines SHLIB_PREREQS for the libpgport dependency, rather than using a makefile rule. This was broken in PG 12. Reported-by: Filip Janus Discussion: https://postgr.es/m/E5Dc85EGUY4wyG8cjAU0qoEdCJxGK_qhW1s9qSuYq9A@mail.gmail.com Author: Dagfinn Ilmari Mannsåker (for libpq) Backpatch-through: 12
-rw-r--r--src/interfaces/ecpg/pgtypeslib/Makefile1
-rw-r--r--src/interfaces/libpq/Makefile3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile
index 530b580d7c8..ae79ead7a78 100644
--- a/src/interfaces/ecpg/pgtypeslib/Makefile
+++ b/src/interfaces/ecpg/pgtypeslib/Makefile
@@ -24,6 +24,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)
SHLIB_LINK_INTERNAL = -lpgcommon_shlib -lpgport_shlib
SHLIB_LINK += $(filter -lintl -lm, $(LIBS))
+SHLIB_PREREQS = submake-libpgport
SHLIB_EXPORTS = exports.txt
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index a06882651f1..d4919970f88 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -85,13 +85,12 @@ endif
ifeq ($(PORTNAME), win32)
SHLIB_LINK += -lshell32 -lws2_32 -lsecur32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS))
endif
+SHLIB_PREREQS = submake-libpgport
SHLIB_EXPORTS = exports.txt
all: all-lib
-all-lib: | submake-libpgport
-
# Shared library stuff
include $(top_srcdir)/src/Makefile.shlib
backend_src = $(top_srcdir)/src/backend