From: Peter Eisentraut Date: Fri, 3 Sep 2021 08:52:11 +0000 (+0200) Subject: Fix pkg-config files for static linking X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=4c2eab3a0dec2eae40892fb525830a5947a398c7;p=users%2Frhaas%2Fpostgres.git Fix pkg-config files for static linking Since ea53100d5 (PostgreSQL 12), the shipped pkg-config files have been broken for statically linking libpq because libpgcommon and libpgport are missing. This patch adds those two missing private dependencies (in a non-hardcoded way). Reported-by: Filip Gospodinov Discussion: https://www.postgresql.org/message-id/flat/c7108bde-e051-11d5-a234-99beec01ce2a@gospodinov.ch --- diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 29a7f6d38c..4b2a62fa14 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -400,7 +400,7 @@ endif # PORTNAME == cygwin || PORTNAME == win32 # those that point inside the build or source tree. Use sort to # remove duplicates. Also record the -l flags necessary for static # linking, but not those already covered by Requires.private. - echo 'Libs.private: $(sort $(filter-out -L.% -L$(top_srcdir)/%,$(filter -L%,$(LDFLAGS) $(SHLIB_LINK)))) $(filter-out $(PKG_CONFIG_REQUIRES_PRIVATE:lib%=-l%),$(filter -l%,$(SHLIB_LINK)))' >>$@ + echo 'Libs.private: $(sort $(filter-out -L.% -L$(top_srcdir)/%,$(filter -L%,$(LDFLAGS) $(SHLIB_LINK)))) $(filter-out $(PKG_CONFIG_REQUIRES_PRIVATE:lib%=-l%),$(filter -l%,$(SHLIB_LINK_INTERNAL) $(SHLIB_LINK)))' >>$@ ##