2017-06-30 22:27:38 +02:00
|
|
|
From b40b9c32be9f991b907493b43c42ba94ee29852c Mon Sep 17 00:00:00 2001
|
2017-01-23 21:37:13 +01:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
|
Date: Sun, 18 Sep 2016 18:58:25 +0200
|
2017-06-02 18:20:04 +02:00
|
|
|
Subject: [PATCH 15/31] Fix linking against shared/static PostgreSQL
|
2017-01-23 21:37:13 +01:00
|
|
|
|
|
|
|
|
---
|
2017-06-30 22:27:38 +02:00
|
|
|
src/plugins/sqldrivers/configure.json | 5 +++--
|
2017-01-23 21:37:13 +01:00
|
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
|
|
2017-06-30 22:27:38 +02:00
|
|
|
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
|
|
|
|
|
index ba74280e8c..78169f46ca 100644
|
|
|
|
|
--- a/src/plugins/sqldrivers/configure.json
|
|
|
|
|
+++ b/src/plugins/sqldrivers/configure.json
|
2017-06-02 18:20:04 +02:00
|
|
|
@@ -73,9 +73,10 @@
|
2017-01-23 21:37:13 +01:00
|
|
|
"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" }
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
--
|
2017-06-30 22:27:38 +02:00
|
|
|
2.13.2
|
2017-01-23 21:37:13 +01:00
|
|
|
|
