summarylogtreecommitdiffstats
path: root/0014-Fix-linking-against-shared-static-MariaDB.patch
diff options
context:
space:
mode:
authorMartchus2017-10-16 19:36:24 +0200
committerMartchus2017-10-16 19:36:24 +0200
commit3e19ccfbbef7d70aff50d047063155091be8c4e8 (patch)
treef5b27b98148bef5f91e884b86528d7a6700a7fac /0014-Fix-linking-against-shared-static-MariaDB.patch
parent94def18b2668f9650f74ffec756e176ccc4c4fb3 (diff)
downloadaur-3e19ccfbbef7d70aff50d047063155091be8c4e8.tar.gz
Update to 5.9.2
Diffstat (limited to '0014-Fix-linking-against-shared-static-MariaDB.patch')
-rw-r--r--0014-Fix-linking-against-shared-static-MariaDB.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/0014-Fix-linking-against-shared-static-MariaDB.patch b/0014-Fix-linking-against-shared-static-MariaDB.patch
index d584bc8bf63..402f1dd8f82 100644
--- a/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0014-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,7 +1,7 @@
-From b4f40814cb08f20a6af9437627afa5f87596072a Mon Sep 17 00:00:00 2001
+From a1d177d63fb62d1bb77225fd90c5eb2883322a26 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
+Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
---
@@ -9,12 +9,12 @@ Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
1 file changed, 3 insertions(+)
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 5603ceb37b..ba74280e8c 100644
+index 234f880579..4619db4a54 100644
--- a/src/plugins/sqldrivers/configure.json
+++ b/src/plugins/sqldrivers/configure.json
-@@ -57,6 +57,9 @@
- "label": "MySQL",
- "test": "unix/mysql",
+@@ -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" },
@@ -23,5 +23,5 @@ index 5603ceb37b..ba74280e8c 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
-2.13.2
+2.14.2