28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
From b4f40814cb08f20a6af9437627afa5f87596072a Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 18:56:55 +0200
|
|
Subject: [PATCH 14/31] Fix linking against shared/static MariaDB
|
|
|
|
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
|
|
---
|
|
src/plugins/sqldrivers/configure.json | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
|
|
index 5603ceb37b..ba74280e8c 100644
|
|
--- a/src/plugins/sqldrivers/configure.json
|
|
+++ b/src/plugins/sqldrivers/configure.json
|
|
@@ -57,6 +57,9 @@
|
|
"label": "MySQL",
|
|
"test": "unix/mysql",
|
|
"sources": [
|
|
+ { "libs": "-lmariadbclient -lssl -lcrypto -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
|
|
+ { "libs": "-Wl,-Bdynamic -lmariadb -Wl,-Bstatic", "condition": "config.win32 && !features.shared" },
|
|
+ { "libs": "-lmariadb", "condition": "config.win32 && features.shared" },
|
|
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
|
|
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
|
|
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
|
|
--
|
|
2.13.2
|
|
|