diff options
| author | Martchus | 2017-02-09 21:00:05 +0100 |
|---|---|---|
| committer | Martchus | 2017-02-09 21:00:05 +0100 |
| commit | 583a16d402710181fac791af2739c8f89ac96336 (patch) | |
| tree | 36b1c59fed2dd465c1d71f13e5be8059a0a8a43b /0013-Fix-linking-against-shared-static-MariaDB.patch | |
| parent | 154985dc9df8cadc0082be08c33c41201b715214 (diff) | |
| download | aur-583a16d402710181fac791af2739c8f89ac96336.tar.gz | |
Update to 5.8.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..0bd7adfb93e2 --- /dev/null +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -0,0 +1,26 @@ +From acbc69f1a6d40c8a4106e4b931650b6921a40503 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:56:55 +0200 +Subject: [PATCH 13/30] Fix linking against shared/static MariaDB + +--- + src/sql/configure.json | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/sql/configure.json b/src/sql/configure.json +index 96c82e84f9..7219926cf5 100644 +--- a/src/sql/configure.json ++++ b/src/sql/configure.json +@@ -58,6 +58,9 @@ + "label": "MySQL", + "test": "unix/mysql", + "sources": [ ++ { "libs": "-lmariadbclient -lssl -lcrypto -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" }, + { "type": "mysqlConfig", "query": "--libs" }, + { "libs": "-lmysqlclient_r", "condition": "!config.win32" }, +-- +2.11.1 + |