database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-05 09:19:17 +03:00
Code

Allow ecpg to be built stand-alone, allow parallel libpq make

Browse Source 
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
This commit is contained in:
Bruce Momjian 2020-03-31 14:17:32 -04:00
parent 82e8018522
commit 051fd5e0f9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/interfaces/ecpg/pgtypeslib/Makefile
View File

@ -24,6 +24,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)
SHLIB_LINK_INTERNAL = -lpgcommon_shlib -lpgport_shlib SHLIB_LINK_INTERNAL = -lpgcommon_shlib -lpgport_shlib
SHLIB_LINK += $(filter -lintl -lm, $(LIBS)) SHLIB_LINK += $(filter -lintl -lm, $(LIBS))
SHLIB_PREREQS = submake-libpgport
SHLIB_EXPORTS = exports.txt SHLIB_EXPORTS = exports.txt

3
src/interfaces/libpq/Makefile
View File

@ -85,13 +85,12 @@ endif
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
SHLIB_LINK += -lshell32 -lws2_32 -lsecur32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS)) SHLIB_LINK += -lshell32 -lws2_32 -lsecur32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS))
endif endif
SHLIB_PREREQS = submake-libpgport
SHLIB_EXPORTS = exports.txt SHLIB_EXPORTS = exports.txt
all: all-lib all: all-lib
all-lib: | submake-libpgport
# Shared library stuff # Shared library stuff
include $(top_srcdir)/src/Makefile.shlib include $(top_srcdir)/src/Makefile.shlib
backend_src = $(top_srcdir)/src/backend backend_src = $(top_srcdir)/src/backend