diff options
author | Martchus | 2019-06-26 14:41:33 +0200 |
---|---|---|
committer | Martchus | 2019-06-26 14:41:33 +0200 |
commit | 7e9790ef70cdbf8552595445b938883ba09b475b (patch) | |
tree | 54f43d30ddceeb2d28776b5e9966044aab7f7f81 /0013-Fix-linking-against-shared-static-MariaDB.patch | |
parent | 748a3f030424dc491a60d5166204dee722f9cbb6 (diff) | |
download | aur-7e9790ef70cdbf8552595445b938883ba09b475b.tar.gz |
Update to 5.13.0
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..b243cd9a738c --- /dev/null +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -0,0 +1,26 @@ +From 7ea90aaf596477d79194673de9fb4b8076883186 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:56:55 +0200 +Subject: [PATCH 13/33] 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 cd20eef1df..babd0465ce 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 -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.22.0 + |