diff options
author | Martchus | 2017-06-08 21:34:00 +0200 |
---|---|---|
committer | Martchus | 2017-06-08 21:34:00 +0200 |
commit | 7173374d6cf10c3f3bfba0aeb3ffc9a792851a22 (patch) | |
tree | 323f39decf999a9a9a5ee9cde325633832b7691f /0013-Fix-linking-against-shared-static-MariaDB.patch | |
parent | 359b0d47f7acead35fd6154db1663860ef829cbe (diff) | |
download | aur-7173374d6cf10c3f3bfba0aeb3ffc9a792851a22.tar.gz |
Update to 5.9.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, 0 insertions, 26 deletions
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch deleted file mode 100644 index ebeac8642293..000000000000 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 889ea99f62dd010c168cce6b18f0d49fb2a48203 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..fce948026f 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 -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" }, - { "type": "mysqlConfig", "query": "--libs" }, - { "libs": "-lmysqlclient_r", "condition": "!config.win32" }, --- -2.12.1 - |