diff options
Diffstat (limited to '0013-Fix-linking-against-shared-static-MariaDB.patch')
| -rw-r--r-- | 0013-Fix-linking-against-shared-static-MariaDB.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch new file mode 100644 index 000000000000..62a25589aaf6 --- /dev/null +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -0,0 +1,26 @@ +From 5cdbce5a33f7881eee348250b1b9867c64ea686d Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:56:55 +0200 +Subject: [PATCH 13/32] Fix linking against shared/static MariaDB + +Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b +--- + src/plugins/sqldrivers/configure.json | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json +index 28ccbeadcde..a5e3001bf60 100644 +--- a/src/plugins/sqldrivers/configure.json ++++ b/src/plugins/sqldrivers/configure.json +@@ -67,6 +67,8 @@ + }, + "headers": "mysql.h", + "sources": [ ++ { "libs": "-lmariadbclient -lssl -lcrypto -lcrypt32 -lshlwapi -lgdi32 -lws2_32 -lpthread -lz -lm", "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.44.0 + |