diff options
author | Martchus | 2020-04-18 21:16:11 +0200 |
---|---|---|
committer | Martchus | 2020-04-18 21:16:11 +0200 |
commit | 9489b8b77c533db3288118bc003d190456bf79ff (patch) | |
tree | 37fb6d03171723e5b4f36025e797cfed815a8579 /0013-Fix-linking-against-shared-static-MariaDB.patch | |
parent | a8990f5c4182e02b451f2d7d1d10cb156263fc48 (diff) | |
download | aur-9489b8b77c533db3288118bc003d190456bf79ff.tar.gz |
Rebuild against mariadb-connector-c 3.1.7
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 3249f32fbb3d..816899734e86 100644 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 2852ac7e9e087b8374daa044dba1885d5c2bbac5 Mon Sep 17 00:00:00 2001 +From 99c6804513dc0dc010fa00108914ff7e865c9ae7 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/31] Fix linking against shared/static MariaDB @@ -9,18 +9,18 @@ Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b 1 file changed, 2 insertions(+) diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json -index cd20eef1df..babd0465ce 100644 +index cd20eef1df..9c8475439f 100644 --- a/src/plugins/sqldrivers/configure.json +++ b/src/plugins/sqldrivers/configure.json @@ -67,6 +67,8 @@ }, "headers": "mysql.h", "sources": [ -+ { "libs": "-lmariadbclient -lssl -lcrypto -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" }, ++ { "libs": "-lmariadbclient -lssl -lcrypto -lshlwapi -lgdi32 -lws2_32 -lpthread -lz -lm", "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.26.0 +2.26.1 |