35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
|
Upstream patch
|
||
|
|
link: https://www.postgresql.org/message-id/20200321221303.GA17979%40momjian.us
|
||
|
|
|
||
|
|
diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile
|
||
|
|
index 530b580d7c..ae79ead7a7 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 a06882651f..d4919970f8 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
|