|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
From 16d52c5ed320dcd7912d4e23c538608a42f32d04 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From e0ac61a6a7ef4a08792f6f3417585ec10a857dc4 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Tilmann Meyer <allescrafterx@gmail.com>
|
|
|
|
|
Date: Fri, 17 Apr 2020 02:12:23 +0200
|
|
|
|
|
Subject: [PATCH 1/2] Fix mingw-w64 build
|
|
|
|
@ -16,7 +16,7 @@ Subject: [PATCH 1/2] Fix mingw-w64 build
|
|
|
|
|
9 files changed, 46 insertions(+), 47 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 2584e93..6c67324 100644
|
|
|
|
|
index 0874e5eb..72072949 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -3,6 +3,9 @@
|
|
|
|
@ -28,7 +28,7 @@ index 2584e93..6c67324 100644
|
|
|
|
|
+
|
|
|
|
|
INCLUDE(CheckFunctionExists)
|
|
|
|
|
IF(COMMAND CMAKE_POLICY)
|
|
|
|
|
SET(NEW_POLICIES CMP0003 CMP0022 CMP0023 CMP0077 CMP0069 CMP0075)
|
|
|
|
|
SET(NEW_POLICIES CMP0003 CMP0022 CMP0023 CMP0057 CMP0077 CMP0069 CMP0075)
|
|
|
|
|
@@ -51,20 +54,16 @@ MACRO(ADD_OPTION _name _text _default)
|
|
|
|
|
ENDMACRO()
|
|
|
|
|
|
|
|
|
@ -55,7 +55,7 @@ index 2584e93..6c67324 100644
|
|
|
|
|
###############
|
|
|
|
|
|
|
|
|
|
INCLUDE(${CC_SOURCE_DIR}/cmake/misc.cmake)
|
|
|
|
|
@@ -251,14 +250,20 @@ IF(UNIX)
|
|
|
|
|
@@ -253,14 +252,20 @@ IF(UNIX)
|
|
|
|
|
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${ZLIB_LIBRARY}
|
|
|
|
|
${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD})
|
|
|
|
|
SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBNSL} ${LIBBIND} ${LIBICONV}
|
|
|
|
@ -83,7 +83,7 @@ index 2584e93..6c67324 100644
|
|
|
|
|
IF(CMAKE_HAVE_PTHREAD_H)
|
|
|
|
|
SET(CMAKE_REQUIRED_INCLUDES pthread.h)
|
|
|
|
|
diff --git a/cmake/install.cmake b/cmake/install.cmake
|
|
|
|
|
index 90bae8b..0fdde87 100644
|
|
|
|
|
index 90bae8b5..0fdde875 100644
|
|
|
|
|
--- a/cmake/install.cmake
|
|
|
|
|
+++ b/cmake/install.cmake
|
|
|
|
|
@@ -62,13 +62,13 @@ ENDIF()
|
|
|
|
@ -103,7 +103,7 @@ index 90bae8b..0fdde87 100644
|
|
|
|
|
ENDIF()
|
|
|
|
|
SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
|
|
|
|
|
diff --git a/cmake/symlink.cmake b/cmake/symlink.cmake
|
|
|
|
|
index c1c883d..cdca6dc 100644
|
|
|
|
|
index c1c883d1..cdca6dce 100644
|
|
|
|
|
--- a/cmake/symlink.cmake
|
|
|
|
|
+++ b/cmake/symlink.cmake
|
|
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
@ -116,19 +116,19 @@ index c1c883d..cdca6dc 100644
|
|
|
|
|
ADD_CUSTOM_COMMAND(
|
|
|
|
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${symlink_name}
|
|
|
|
|
diff --git a/include/ma_global.h b/include/ma_global.h
|
|
|
|
|
index d6077f3..d68f921 100644
|
|
|
|
|
index 6d1c6f65..bcb1d974 100644
|
|
|
|
|
--- a/include/ma_global.h
|
|
|
|
|
+++ b/include/ma_global.h
|
|
|
|
|
@@ -34,7 +34,7 @@
|
|
|
|
|
#define snprintf _snprintf
|
|
|
|
|
@@ -36,7 +36,7 @@
|
|
|
|
|
#endif
|
|
|
|
|
#define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
|
|
|
|
|
#endif
|
|
|
|
|
-#define STDCALL __stdcall
|
|
|
|
|
+#define STDCALL
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <ma_config.h>
|
|
|
|
|
@@ -440,7 +440,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
|
|
|
|
|
@@ -442,7 +442,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
|
|
|
|
|
#define NO_PISAM /* Not needed anymore */
|
|
|
|
|
#define NO_MISAM /* Not needed anymore */
|
|
|
|
|
#define NO_HASH /* Not needed anymore */
|
|
|
|
@ -138,7 +138,7 @@ index d6077f3..d68f921 100644
|
|
|
|
|
#define USE_MY_STAT_STRUCT /* For my_lib */
|
|
|
|
|
#ifdef _MSC_VER
|
|
|
|
|
diff --git a/include/mysql.h b/include/mysql.h
|
|
|
|
|
index 8a3884c..a2bc3cd 100644
|
|
|
|
|
index 76b16830..97584819 100644
|
|
|
|
|
--- a/include/mysql.h
|
|
|
|
|
+++ b/include/mysql.h
|
|
|
|
|
@@ -39,11 +39,7 @@ extern "C" {
|
|
|
|
@ -153,7 +153,7 @@ index 8a3884c..a2bc3cd 100644
|
|
|
|
|
|
|
|
|
|
#ifndef my_socket_defined
|
|
|
|
|
#define my_socket_defined
|
|
|
|
|
@@ -471,7 +467,7 @@ struct st_mysql_client_plugin
|
|
|
|
|
@@ -480,7 +476,7 @@ struct st_mysql_client_plugin
|
|
|
|
|
MYSQL_CLIENT_PLUGIN_HEADER
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
@ -163,7 +163,7 @@ index 8a3884c..a2bc3cd 100644
|
|
|
|
|
int argc, ...);
|
|
|
|
|
struct st_mysql_client_plugin * STDCALL
|
|
|
|
|
diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h
|
|
|
|
|
index 262fd4a..9a0e1e6 100644
|
|
|
|
|
index 262fd4a0..9a0e1e66 100644
|
|
|
|
|
--- a/include/mysql/client_plugin.h
|
|
|
|
|
+++ b/include/mysql/client_plugin.h
|
|
|
|
|
@@ -194,7 +194,7 @@ typedef struct st_mysql_client_plugin_REMOTEIO
|
|
|
|
@ -176,10 +176,10 @@ index 262fd4a..9a0e1e6 100644
|
|
|
|
|
int argc, ...);
|
|
|
|
|
|
|
|
|
|
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
|
|
|
|
|
index 7faf827..43ab846 100644
|
|
|
|
|
index 43ed67b4..d6e23e56 100644
|
|
|
|
|
--- a/libmariadb/CMakeLists.txt
|
|
|
|
|
+++ b/libmariadb/CMakeLists.txt
|
|
|
|
|
@@ -405,7 +405,7 @@ ENDIF()
|
|
|
|
|
@@ -436,7 +436,7 @@ ENDIF()
|
|
|
|
|
FILE(WRITE ${CC_BINARY_DIR}/manpages.list "${MARIADB_LIB_SYMBOLS};${MYSQL_LIB_SYMBOLS}")
|
|
|
|
|
|
|
|
|
|
IF(WIN32)
|
|
|
|
@ -188,8 +188,8 @@ index 7faf827..43ab846 100644
|
|
|
|
|
"FILE_TYPE:VFT_DLL"
|
|
|
|
|
"SOURCE_FILE:libmariadb/libmariadb.c"
|
|
|
|
|
"ORIGINAL_FILE_NAME:libmariadb.dll"
|
|
|
|
|
@@ -417,30 +417,28 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE})
|
|
|
|
|
TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
|
|
|
|
|
@@ -447,30 +447,28 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE})
|
|
|
|
|
TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS} ${CRYPTO_LIBS})
|
|
|
|
|
|
|
|
|
|
IF(UNIX)
|
|
|
|
|
- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE})
|
|
|
|
@ -203,8 +203,8 @@ index 7faf827..43ab846 100644
|
|
|
|
|
+ SET_TARGET_PROPERTIES(mariadb PROPERTIES LINKER_LANGUAGE C)
|
|
|
|
|
ENDIF()
|
|
|
|
|
|
|
|
|
|
-TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS})
|
|
|
|
|
+TARGET_LINK_LIBRARIES(mariadb LINK_PRIVATE ${SYSTEM_LIBS})
|
|
|
|
|
-TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS} ${CRYPTO_LIBS})
|
|
|
|
|
+TARGET_LINK_LIBRARIES(mariadb LINK_PRIVATE ${SYSTEM_LIBS} ${CRYPTO_LIBS})
|
|
|
|
|
|
|
|
|
|
-SIGN_TARGET(libmariadb)
|
|
|
|
|
+SIGN_TARGET(mariadb)
|
|
|
|
@ -228,7 +228,7 @@ index 7faf827..43ab846 100644
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Installation
|
|
|
|
|
@@ -452,8 +450,8 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
|
|
|
|
|
@@ -482,8 +480,8 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
|
|
|
|
|
# use mariadb client library we provide libmysql symlinks
|
|
|
|
|
|
|
|
|
|
IF(WITH_MYSQLCOMPAT)
|
|
|
|
@ -239,7 +239,7 @@ index 7faf827..43ab846 100644
|
|
|
|
|
IF(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
|
|
|
|
|
create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
|
|
|
|
|
create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
|
|
|
|
|
@@ -462,7 +460,7 @@ ENDIF()
|
|
|
|
|
@@ -492,7 +490,7 @@ ENDIF()
|
|
|
|
|
|
|
|
|
|
create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
|
|
|
|
|
|
|
|
|
@ -248,7 +248,7 @@ index 7faf827..43ab846 100644
|
|
|
|
|
${CPACK_PACKAGE_VERSION_MAJOR}
|
|
|
|
|
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
|
|
|
|
|
|
|
|
|
|
@@ -479,18 +477,18 @@ INSTALL(TARGETS libmariadb
|
|
|
|
|
@@ -509,18 +507,18 @@ INSTALL(TARGETS libmariadb
|
|
|
|
|
DESTINATION ${INSTALL_LIBDIR})
|
|
|
|
|
ELSE()
|
|
|
|
|
# in cmake 3.12+ we can use
|
|
|
|
@ -272,7 +272,7 @@ index 7faf827..43ab846 100644
|
|
|
|
|
COMPONENT Development)
|
|
|
|
|
ENDIF()
|
|
|
|
|
diff --git a/plugins/auth/CMakeLists.txt b/plugins/auth/CMakeLists.txt
|
|
|
|
|
index e5448f8..ae2cf27 100644
|
|
|
|
|
index 83e324b9..7f71070c 100644
|
|
|
|
|
--- a/plugins/auth/CMakeLists.txt
|
|
|
|
|
+++ b/plugins/auth/CMakeLists.txt
|
|
|
|
|
@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${AUTH_DIR})
|
|
|
|
@ -285,7 +285,7 @@ index e5448f8..ae2cf27 100644
|
|
|
|
|
SET(CRYPT_SOURCE ${CC_SOURCE_DIR}/libmariadb/secure/win_crypt.c)
|
|
|
|
|
SET(CRYPT_LIBS crypt32 bcrypt)
|
|
|
|
|
diff --git a/plugins/io/CMakeLists.txt b/plugins/io/CMakeLists.txt
|
|
|
|
|
index 8c304c9..e2e9c5a 100644
|
|
|
|
|
index 8c304c99..e2e9c5a1 100644
|
|
|
|
|
--- a/plugins/io/CMakeLists.txt
|
|
|
|
|
+++ b/plugins/io/CMakeLists.txt
|
|
|
|
|
@@ -10,6 +10,6 @@ IF (WITH_CURL)
|
|
|
|
@ -297,5 +297,5 @@ index 8c304c9..e2e9c5a 100644
|
|
|
|
|
ENDIF()
|
|
|
|
|
ENDIF()
|
|
|
|
|
--
|
|
|
|
|
2.37.1
|
|
|
|
|
2.42.0
|
|
|
|
|
|
|
|
|
|