30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From ee6b2158ed83ed926ba3f17f7c520fb889ef74ac Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 18:58:25 +0200
|
|
Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
|
|
|
|
---
|
|
src/plugins/sqldrivers/configure.json | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
|
|
index 4619db4a54..ef0d45f6cc 100644
|
|
--- a/src/plugins/sqldrivers/configure.json
|
|
+++ b/src/plugins/sqldrivers/configure.json
|
|
@@ -91,9 +91,10 @@
|
|
]
|
|
},
|
|
"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.19.0
|
|
|