aboutsummarylogtreecommitdiffstats
path: root/0014-Fix-linking-against-shared-static-PostgreSQL.patch
diff options
context:
space:
mode:
Diffstat (limited to '0014-Fix-linking-against-shared-static-PostgreSQL.patch')
-rw-r--r--0014-Fix-linking-against-shared-static-PostgreSQL.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
new file mode 100644
index 000000000000..41d712cb5a14
--- /dev/null
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -0,0 +1,28 @@
+From e9076f7d190ce29321102ce695dbd105cccf14f7 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 18 Sep 2016 18:58:25 +0200
+Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL
+
+---
+ src/plugins/sqldrivers/configure.json | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
+index babd0465ce..b4b3bdec6b 100644
+--- a/src/plugins/sqldrivers/configure.json
++++ b/src/plugins/sqldrivers/configure.json
+@@ -88,9 +88,9 @@
+ },
+ "headers": "libpq-fe.h",
+ "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 -liconv", "condition": "config.win32 && !features.shared" },
++ { "type": "psqlEnv", "libs": "-lpq", "condition": "config.win32 && features.shared" },
+ { "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" }
+ ]
+ },
+--
+2.22.0
+