Commit051fd5e

committed

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

This change defines SHLIB_PREREQS for the libpgport dependency, ratherthan using a makefile rule. This was broken in PG 12.Reported-by: Filip JanusDiscussion:https://postgr.es/m/E5Dc85EGUY4wyG8cjAU0qoEdCJxGK_qhW1s9qSuYq9A@mail.gmail.comAuthor: Dagfinn Ilmari Mannsåker (for libpq)Backpatch-through: 12

1 parent82e8018 commit051fd5eCopy full SHA for 051fd5e

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)`
`24`	`24`
`25`	`25`	`SHLIB_LINK_INTERNAL = -lpgcommon_shlib -lpgport_shlib`
`26`	`26`	`SHLIB_LINK +=$(filter -lintl -lm,$(LIBS))`
	`27`	`+SHLIB_PREREQS = submake-libpgport`
`27`	`28`
`28`	`29`	`SHLIB_EXPORTS = exports.txt`
`29`	`30`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,13 +85,12 @@ endif`
`85`	`85`	`ifeq ($(PORTNAME), win32)`
`86`	`86`	`SHLIB_LINK += -lshell32 -lws2_32 -lsecur32$(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32,$(LIBS))`
`87`	`87`	`endif`
	`88`	`+SHLIB_PREREQS = submake-libpgport`
`88`	`89`
`89`	`90`	`SHLIB_EXPORTS = exports.txt`
`90`	`91`
`91`	`92`	`all: all-lib`
`92`	`93`
`93`		`-all-lib: \| submake-libpgport`
`94`		`-`
`95`	`94`	`# Shared library stuff`
`96`	`95`	`include$(top_srcdir)/src/Makefile.shlib`
`97`	`96`	`backend_src =$(top_srcdir)/src/backend`

Comments

(0)