From 55392bc5b0e0c1a8045627bbc41b4ec7143c4cc7 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 6 Sep 2021 09:12:34 +0200 Subject: [PATCH] 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. --- src/Makefile.shlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)))' >>$@ ## -- 2.39.5