From 45af204ca687d58c369bde320ebf6fcfcaae4535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Thu, 28 Dec 2017 15:15:41 +0100 Subject: [PATCH] Fix Makefile for MariaDB Connector C 3.0.2 --- deps/Makefile | 4 ++-- deps/mariadb-client-library/mariadb_lib.c.patch | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index 148ef4b8d..cc2849e9b 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -68,7 +68,7 @@ jemalloc/jemalloc/lib/libjemalloc.a: jemalloc: jemalloc/jemalloc/lib/libjemalloc.a -mariadb-client-library/mariadb_client/include/my_config.h: +mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: cd mariadb-client-library && rm -rf mariadb-connector-c-3.0.2-src cd mariadb-client-library && tar -zxf mariadb-connector-c-3.0.2-src.tar.gz cd mariadb-client-library/mariadb_client && cmake . @@ -86,7 +86,7 @@ mariadb-client-library/mariadb_client/include/my_config.h: cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE} # cd mariadb-client-library/mariadb_client/include && make my_config.h -mariadb_client: mariadb-client-library/mariadb_client/include/my_config.h +mariadb_client: mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a sqlite3/sqlite3/sqlite3.o: diff --git a/deps/mariadb-client-library/mariadb_lib.c.patch b/deps/mariadb-client-library/mariadb_lib.c.patch index d5dbcc070..52ef8dd8a 100644 --- a/deps/mariadb-client-library/mariadb_lib.c.patch +++ b/deps/mariadb-client-library/mariadb_lib.c.patch @@ -1,3 +1,5 @@ +--- /tmp/mariadb_lib.c 2017-12-28 14:21:33.620559119 +0100 ++++ libmariadb/mariadb_lib.c 2017-12-28 15:12:33.117032010 +0100 @@ -1494,9 +1494,16 @@ mysql->client_flag= client_flag; @@ -20,7 +22,7 @@ mysql->db, mysql->port, mysql->unix_socket, mysql->client_flag | CLIENT_REMEMBER_OPTIONS) || - mysql_set_character_set(&tmp_mysql, mysql->charset->csname)) -+ mysql_set_character_set(&tmp_mysql, mysql->charset->csname, NULL)) ++ mysql_set_character_set(&tmp_mysql, mysql->charset->csname, 0)) { if (ctxt) my_context_install_suspend_resume_hook(ctxt, NULL, NULL);