diff options
| author | Bruce Momjian <bruce@momjian.us> | 2020-03-31 14:17:32 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2020-03-31 14:17:32 -0400 |
| commit | 297a174d25b80450aa2bdb058d0a5f2e65f3ba37 (patch) | |
| tree | 018f24198bf696d7ff0fe2f8b06dc091b5152eeb /src | |
| parent | ee40e8975e2cd2811d14a35ce9179bd46e1f59f2 (diff) | |
| download | postgresql-297a174d25b80450aa2bdb058d0a5f2e65f3ba37.tar.gz postgresql-297a174d25b80450aa2bdb058d0a5f2e65f3ba37.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
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/ecpg/pgtypeslib/Makefile | 1 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile index fcc18c193cd..99d8c56242b 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 4b0a8c719db..32a9fdfb7bc 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -72,13 +72,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 |