diff options
| author | Martchus | 2017-03-23 00:12:58 +0100 |
|---|---|---|
| committer | Martchus | 2017-03-23 00:15:15 +0100 |
| commit | 288f048fafcb5879c7c038c7e507b6ea98732b93 (patch) | |
| tree | aec91813a97623f15432f7f791a11a38b3d1e43f /0013-Fix-linking-against-shared-static-MariaDB.patch | |
| parent | 017bc5699e8507491c2acbe88d0fd51185422c11 (diff) | |
| download | aur-288f048fafcb5879c7c038c7e507b6ea98732b93.tar.gz | |
Fix mingw-w64-qt5-base-static
* Fix StaticQt5::Test
* Fix linking against static MariaDB
Diffstat (limited to '0013-Fix-linking-against-shared-static-MariaDB.patch')
| -rw-r--r-- | 0013-Fix-linking-against-shared-static-MariaDB.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch index 0bd7adfb93e2..ebeac8642293 100644 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From acbc69f1a6d40c8a4106e4b931650b6921a40503 Mon Sep 17 00:00:00 2001 +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 @@ -8,19 +8,19 @@ Subject: [PATCH 13/30] Fix linking against shared/static MariaDB 1 file changed, 3 insertions(+) diff --git a/src/sql/configure.json b/src/sql/configure.json -index 96c82e84f9..7219926cf5 100644 +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 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" }, ++ { "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.11.1 +2.12.1 |