diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2021-09-03 10:52:11 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2021-09-03 10:52:11 +0200 |
| commit | 4c2eab3a0dec2eae40892fb525830a5947a398c7 (patch) | |
| tree | af83397618154282795703df8f3231b782780871 | |
| parent | c95ede41b8d47b21d58702fbc519e720f41fdaf1 (diff) | |
| download | postgresql-4c2eab3a0dec2eae40892fb525830a5947a398c7.tar.gz postgresql-4c2eab3a0dec2eae40892fb525830a5947a398c7.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
| -rw-r--r-- | src/Makefile.shlib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 29a7f6d38c8..4b2a62fa14c 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)))' >>$@ ## |