diff options
Diffstat (limited to '0014-Fix-linking-against-shared-static-MariaDB.patch')
| -rw-r--r-- | 0014-Fix-linking-against-shared-static-MariaDB.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/0014-Fix-linking-against-shared-static-MariaDB.patch b/0014-Fix-linking-against-shared-static-MariaDB.patch new file mode 100644 index 000000000000..1d5d8bdb7837 --- /dev/null +++ b/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -0,0 +1,27 @@ +From d8dca16ee267d09792a232e415cd92ef3ec4b294 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:56:55 +0200 +Subject: [PATCH 14/32] 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 234f880579..4619db4a54 100644 +--- a/src/plugins/sqldrivers/configure.json ++++ b/src/plugins/sqldrivers/configure.json +@@ -69,6 +69,9 @@ + "main": "mysql_get_client_version();" + }, + "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.16.1 + |