aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2021-09-06 09:12:34 +0200
committerPeter Eisentraut <peter@eisentraut.org>2021-09-06 09:12:34 +0200
commit55392bc5b0e0c1a8045627bbc41b4ec7143c4cc7 (patch)
treefe28e7558fde15f1599a3dc1305296f4954e83bb
parent0bd305ee1d427ef29f5fa4fa20567e3b3f5ff792 (diff)
downloadpostgresql-55392bc5b0e0c1a8045627bbc41b4ec7143c4cc7.tar.gz
postgresql-55392bc5b0e0c1a8045627bbc41b4ec7143c4cc7.zip
Improve fix pkg-config files for static linking
Amend 4c2eab3a0dec2eae40892fb525830a5947a398c7 to link against the libraries without the "_shlib" suffix, since this is meant for static linking.
-rw-r--r--src/Makefile.shlib2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 59779b616f3..cbd9e02b9dd 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -405,7 +405,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_INTERNAL) $(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)))' >>$@
##