summarylogtreecommitdiffstats
path: root/0014-Fix-linking-against-shared-static-MariaDB.patch
diff options
context:
space:
mode:
authorMartchus2019-06-26 14:41:33 +0200
committerMartchus2019-06-26 14:41:33 +0200
commit7e9790ef70cdbf8552595445b938883ba09b475b (patch)
tree54f43d30ddceeb2d28776b5e9966044aab7f7f81 /0014-Fix-linking-against-shared-static-MariaDB.patch
parent748a3f030424dc491a60d5166204dee722f9cbb6 (diff)
downloadaur-mingw-w64-qt5-base.tar.gz
Update to 5.13.0
Diffstat (limited to '0014-Fix-linking-against-shared-static-MariaDB.patch')
-rw-r--r--0014-Fix-linking-against-shared-static-MariaDB.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/0014-Fix-linking-against-shared-static-MariaDB.patch b/0014-Fix-linking-against-shared-static-MariaDB.patch
deleted file mode 100644
index 5ec2a7e1216..00000000000
--- a/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b35664794a3658470c900c4a7c1b8dbf436359ca Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 14/34] 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.21.0
-