aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2021-09-06 09:41:03 +0200
committerPeter Eisentraut <peter@eisentraut.org>2021-09-06 09:41:03 +0200
commit1e9afc868eb5a3b2f50629c2724d9fcdbe0afee2 (patch)
tree0face2a6d5015d594d42cebd02af9ea92dd8d80f /src
parent718978d9daa7128e0f5e4e06c0fd402cdd63704f (diff)
downloadpostgresql-1e9afc868eb5a3b2f50629c2724d9fcdbe0afee2.tar.gz
postgresql-1e9afc868eb5a3b2f50629c2724d9fcdbe0afee2.zip
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 <f@gospodinov.ch> Discussion: https://www.postgresql.org/message-id/flat/c7108bde-e051-11d5-a234-99beec01ce2a@gospodinov.ch
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.shlib2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 29a7f6d38c8..1e08698b497 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=%) $(SHLIB_LINK)))' >>$@
##