8000 Allow ecpg to be built stand-alone, allow parallel libpq make · postgrespro/postgres_cluster@051fd5e · GitHub
[go: up one dir, main page]
Skip to content

Commit 051fd5e

Browse files
bmomjianbmomjian
committed
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
1 parent 82e8018 commit 051fd5e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎src/interfaces/ecpg/pgtypeslib/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)
2424

2525
SHLIB_LINK_INTERNAL = -lpgcommon_shlib -lpgport_shlib
2626
SHLIB_LINK += $(filter -lintl -lm, $(LIBS))
27+
SHLIB_PREREQS = submake-libpgport
2728

2829
SHLIB_EXPORTS = exports.txt
2930

‎src/interfaces/libpq/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,12 @@ endif
8585
ifeq ($(PORTNAME), win32)
8686
SHLIB_LINK += -lshell32 -lws2_32 -lsecur32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS))
8787
endif
88+
SHLIB_PREREQS = submake-libpgport
8889

8990
SHLIB_EXPORTS = exports.txt
9091

9192
all: all-lib
9293

93-
all-lib: | submake-libpgport
94-
9594
# Shared library stuff
9695
include $(top_srcdir)/src/Makefile.shlib
9796
backend_src = $(top_srcdir)/src/backend

0 commit comments

Comments
 (0)
0