From: Peter Eisentraut Date: Mon, 6 Sep 2021 07:41:03 +0000 (+0200) Subject: Fix pkg-config files for static linking X-Git-Tag: REL_12_9~85 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60bf7e69b07851d28e59d3c19fcbd6893866a519;p=thirdparty%2Fpostgresql.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 373d73caefc..ec60956ae2b 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -409,7 +409,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=%) $(SHLIB_LINK)))' >>$@ # We need several not-quite-identical variants of .DEF files to build