summarylogtreecommitdiffstats
path: root/0014-Fix-linking-against-shared-static-MariaDB.patch
diff options
context:
space:
mode:
authorMartchus2017-06-08 21:33:56 +0200
committerMartchus2017-06-08 21:33:56 +0200
commit3df6482af8c916f5105111d1dcf6711e01a56c47 (patch)
tree55879cff03b12573e665e21cdd7c7d7e65df1c2d /0014-Fix-linking-against-shared-static-MariaDB.patch
parent288f048fafcb5879c7c038c7e507b6ea98732b93 (diff)
downloadaur-3df6482af8c916f5105111d1dcf6711e01a56c47.tar.gz
Update to 5.9.0
Diffstat (limited to '0014-Fix-linking-against-shared-static-MariaDB.patch')
-rw-r--r--0014-Fix-linking-against-shared-static-MariaDB.patch27
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 00000000000..3bfd5ad64fe
--- /dev/null
+++ b/0014-Fix-linking-against-shared-static-MariaDB.patch
@@ -0,0 +1,27 @@
+From ea1df506321d35a9f8a648ea98642b034b7ace48 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
+
+Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
+---
+ src/sql/configure.json | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/sql/configure.json b/src/sql/configure.json
+index 49444c7e5f..d162d7bc09 100644
+--- a/src/sql/configure.json
++++ b/src/sql/configure.json
+@@ -57,6 +57,9 @@
+ "label": "MySQL",
+ "test": "unix/mysql",
+ "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.13.0
+