diff options
Diffstat (limited to '0015-Fix-linking-against-shared-static-PostgreSQL.patch')
| -rw-r--r-- | 0015-Fix-linking-against-shared-static-PostgreSQL.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/0015-Fix-linking-against-shared-static-PostgreSQL.patch new file mode 100644 index 000000000000..f626887c5e4f --- /dev/null +++ b/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -0,0 +1,29 @@ +From cb4fbac9533065928a6c839da4675c60cb7fe6c0 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:58:25 +0200 +Subject: [PATCH 15/31] Fix linking against shared/static PostgreSQL + +--- + src/sql/configure.json | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/sql/configure.json b/src/sql/configure.json +index d162d7bc09..0f86b23f22 100644 +--- a/src/sql/configure.json ++++ b/src/sql/configure.json +@@ -73,9 +73,10 @@ + "label": "PostgreSQL", + "test": "unix/psql", + "sources": [ +- { "type": "pkgConfig", "args": "libpq" }, + { "type": "psqlConfig" }, +- { "type": "psqlEnv", "libs": "-llibpq -lws2_32 -ladvapi32", "condition": "config.win32" }, ++ { "type": "psqlEnv", "libs": "-lpq -lintl -lssl -lcrypto -lshell32 -lws2_32 -lsecur32", "condition": "config.win32 && !features.shared" }, ++ { "type": "psqlEnv", "libs": "-Wl,-Bdynamic -lpq -Wl,-Bstatic", "condition": "config.win32 && !features.shared" }, ++ { "type": "psqlEnv", "libs": "-lpq", "condition": "config.win32 && features.shared" }, + { "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" } + ] + }, +-- +2.13.0 + |