dsc
/
mxe
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup libmysqlclient-1-fixes.patch

Browse Source 
$ tools/patch-tool-mxe init libmysqlclient
$ tools/patch-tool-mxe import libmysqlclient
$ tools/patch-tool-mxe export libmysqlclient
pull/1078/head
Boris Nagaev 9 years ago
parent 6e50094684
commit 25f51ef01d
1 changed files with 36 additions and 59 deletions
Show Stats Download Patch File Download Diff File

95
src/libmysqlclient-1-fixes.patch
Unescape View File

@ -3,15 +3,15 @@ See index.html for further information.
Contains ad hoc patches for cross building.
From 93f3a29abe0397e5a6681c07c3223372b5451bb0 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 6 Sep 2015 22:34:47 +0100
Subject: [PATCH 1/7] use comp_err tool built in native build
Subject: [PATCH] use comp_err tool built in native build
See http://www.vtk.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index ac28c62..b2cbb75 100644
index 1111111..2222222 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -20,13 +20,29 @@ ${ZLIB_INCLUDE_DIR})
@ -44,19 +44,16 @@ index ac28c62..b2cbb75 100644
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
COMMAND comp_err
--
2.3.8 (Apple Git-58)
From e45e5c21360b12cb9f271a29bd1d4d183ed55060 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 6 Sep 2015 22:53:33 +0100
Subject: [PATCH 2/7] fix extra qualification 'Handshake::'
Subject: [PATCH] fix extra qualification 'Handshake::'
Compilation error.
diff --git a/libmysql/authentication_win/handshake.h b/libmysql/authentication_win/handshake.h
index 14b1386..395af36 100644
index 1111111..2222222 100644
--- a/libmysql/authentication_win/handshake.h
+++ b/libmysql/authentication_win/handshake.h
@@ -100,7 +100,7 @@ public:
@ -68,18 +65,15 @@ index 14b1386..395af36 100644
bool virtual is_complete() const
{
--
2.3.8 (Apple Git-58)
From a2deca6cb6f87bb926d12149595c84f29ae00d0e Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 7 Sep 2015 22:59:18 +0100
Subject: [PATCH 3/7] fix case in headers and libs (should be lowercase)
Subject: [PATCH] fix case in headers and libs (should be lowercase)
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
index 2993a1a..04b1fda 100644
index 1111111..2222222 100644
--- a/extra/yassl/src/yassl_int.cpp
+++ b/extra/yassl/src/yassl_int.cpp
@@ -20,7 +20,7 @@
@ -92,7 +86,7 @@ index 2993a1a..04b1fda 100644
#include <pthread.h>
#endif
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h
index 41a7cb4..5f6d91d 100644
index 1111111..2222222 100644
--- a/include/mysql/psi/mysql_socket.h
+++ b/include/mysql/psi/mysql_socket.h
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@ -105,7 +99,7 @@ index 41a7cb4..5f6d91d 100644
#else
#include <netinet/in.h>
diff --git a/libmysql/authentication_win/CMakeLists.txt b/libmysql/authentication_win/CMakeLists.txt
index f2979fb..83e5441 100644
index 1111111..2222222 100644
--- a/libmysql/authentication_win/CMakeLists.txt
+++ b/libmysql/authentication_win/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(HEADERS common.h handshake.h)
@ -118,7 +112,7 @@ index f2979fb..83e5441 100644
# In IDE, group headers in a separate folder.
diff --git a/libmysql/authentication_win/plugin_client.cc b/libmysql/authentication_win/plugin_client.cc
index d25aae8..ecfee79 100644
index 1111111..2222222 100644
--- a/libmysql/authentication_win/plugin_client.cc
+++ b/libmysql/authentication_win/plugin_client.cc
@@ -26,7 +26,7 @@
@ -130,20 +124,17 @@ index d25aae8..ecfee79 100644
#endif
static int win_auth_client_plugin_init(char*, size_t, int, va_list)
--
2.3.8 (Apple Git-58)
From 7517a9a4ce9b123470ff8cc040acfa1777acc832 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 7 Sep 2015 23:01:35 +0100
Subject: [PATCH 4/7] define missing types
Subject: [PATCH] define missing types
We do not use types CERT_NAME_BLOB and CRYPT_HASH_BLOB,
though they are used in mprapi.h. And are not defined!
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c
index 780c765..e2cd321 100644
index 1111111..2222222 100644
--- a/mysys/my_gethwaddr.c
+++ b/mysys/my_gethwaddr.c
@@ -137,6 +137,9 @@ my_bool my_gethwaddr(uchar *to)
@ -156,14 +147,11 @@ index 780c765..e2cd321 100644
#include <iphlpapi.h>
/*
--
2.3.8 (Apple Git-58)
From 12358baf55265ff6d2764771199645e811863853 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 7 Sep 2015 23:04:23 +0100
Subject: [PATCH 5/7] macro NATIVE_WIN32 for stuff we don't have here
Subject: [PATCH] macro NATIVE_WIN32 for stuff we don't have here
Macro NATIVE_WIN32 is undefined in MXE. It is used instead of _WIN32
in #ifdef's where working variant is Unix and not Win32:
@ -173,7 +161,7 @@ in #ifdef's where working variant is Unix and not Win32:
* MXE has Unix-like stacktrace reader
diff --git a/include/m_string.h b/include/m_string.h
index e1576af..5417192 100644
index 1111111..2222222 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -127,7 +127,7 @@ static inline ulonglong my_strtoull(const char *nptr, char **endptr, int base)
@ -186,7 +174,7 @@ index e1576af..5417192 100644
#else
return strtok_r(str, delim, saveptr);
diff --git a/include/my_global.h b/include/my_global.h
index acadb44..8c3c3cd 100644
index 1111111..2222222 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -205,7 +205,7 @@ C_MODE_START
@ -236,7 +224,7 @@ index acadb44..8c3c3cd 100644
ts1->tv_nsec - ts2->tv_nsec;
#else
diff --git a/include/thr_cond.h b/include/thr_cond.h
index 480e936..03fbc24 100644
index 1111111..2222222 100644
--- a/include/thr_cond.h
+++ b/include/thr_cond.h
@@ -39,7 +39,7 @@ typedef CONDITION_VARIABLE native_cond_t;
@ -258,7 +246,7 @@ index 480e936..03fbc24 100644
return ETIMEDOUT;
return 0;
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c
index 226d469..db94096 100644
index 1111111..2222222 100644
--- a/mysys/stacktrace.c
+++ b/mysys/stacktrace.c
@@ -15,7 +15,7 @@
@ -270,18 +258,15 @@ index 226d469..db94096 100644
#include "my_pthread.h"
#include "m_string.h"
#include <signal.h>
--
2.3.8 (Apple Git-58)
From 4f6b41efba4a862d34de3d03980d283d60c57c28 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 8 Oct 2015 13:30:53 +1100
Subject: [PATCH 6/7] fix shared lib names
Subject: [PATCH] fix shared lib names
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index 17c8c03..9e2980b 100644
index 1111111..2222222 100644
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
@@ -216,7 +216,7 @@ MACRO(GET_TARGET_NAME target out_name)
@ -311,18 +296,15 @@ index 17c8c03..9e2980b 100644
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
--
2.3.8 (Apple Git-58)
From d57fefef1a1eb15d14dc64d4c59267746f02369d Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 8 Oct 2015 19:36:35 +1100
Subject: [PATCH 7/7] allow install of mysql_config
Subject: [PATCH] allow install of mysql_config
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 69d19b8..738563b 100644
index 1111111..2222222 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -92,7 +92,7 @@ ENDIF()
@ -334,11 +316,8 @@ index 69d19b8..738563b 100644
# On Windows, some .sh and some .pl.in files are configured
# The resulting files will have .pl extension (those are perl scripts)
--
2.3.8 (Apple Git-58)
From eb38e04f41ac341b162cfa0e97aa3ee1ce783777 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 11 Nov 2015 07:44:44 +0000
Subject: [PATCH] add 'static' to some inline functions
@ -347,7 +326,7 @@ Fix https://gist.github.com/starius/71d5f276d62e58f36d2f
See also http://stackoverflow.com/a/8502046
diff --git a/include/my_global.h b/include/my_global.h
index 8c3c3cd..3cb24f6 100644
index 1111111..2222222 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -340,7 +340,7 @@ typedef socket_len_t SOCKET_SIZE_TYPE; /* Used by NDB */
@ -368,6 +347,4 @@ index 8c3c3cd..3cb24f6 100644
{
double t= d - (double) 0x8000000000000000ULL;
--
2.1.4

Write Preview
Loading…
Cancel
Save