Update mingw-w64-mariadb-connector-c to 3.1.12
This commit is contained in:
parent
8d39d1fb1a
commit
fe9368246b
|
|
@ -1,26 +1,25 @@
|
|||
From 6481c6309400befa8a32c8d1de812df09e18f4ae Mon Sep 17 00:00:00 2001
|
||||
From 72c4fd579384ec3c00500177f318df49f7502314 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
|
||||
Subject: [PATCH 1/3] Fix mingw-w64 build
|
||||
|
||||
---
|
||||
CMakeLists.txt | 30 +++++++++++++-----------
|
||||
CMakeLists.txt | 34 +++++++++++++++------------
|
||||
cmake/install.cmake | 4 ++--
|
||||
cmake/symlink.cmake | 2 +-
|
||||
include/ma_global.h | 4 ++--
|
||||
include/mysql.h | 6 +----
|
||||
include/mysql/client_plugin.h | 2 +-
|
||||
libmariadb/CMakeLists.txt | 42 ++++++++++++++++++----------------
|
||||
libmariadb/mariadb_lib.c | 2 +-
|
||||
plugins/auth/CMakeLists.txt | 2 +-
|
||||
plugins/auth/caching_sha2_pw.c | 2 +-
|
||||
plugins/auth/ed25519.c | 2 +-
|
||||
plugins/auth/sha256_pw.c | 4 ++--
|
||||
plugins/io/CMakeLists.txt | 2 +-
|
||||
13 files changed, 53 insertions(+), 51 deletions(-)
|
||||
12 files changed, 54 insertions(+), 52 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 568e4f5..09b91c2 100644
|
||||
index 68250af..640670f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -2,6 +2,8 @@
|
||||
|
|
@ -32,7 +31,7 @@ index 568e4f5..09b91c2 100644
|
|||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
|
||||
INCLUDE(CheckFunctionExists)
|
||||
IF(COMMAND CMAKE_POLICY)
|
||||
@@ -51,14 +53,10 @@ MACRO(ADD_OPTION _name _text _default)
|
||||
@@ -51,20 +53,16 @@ MACRO(ADD_OPTION _name _text _default)
|
||||
ENDMACRO()
|
||||
|
||||
### Options ###
|
||||
|
|
@ -42,6 +41,7 @@ index 568e4f5..09b91c2 100644
|
|||
- ADD_OPTION(WITH_MSI "Build MSI installation package" OFF)
|
||||
- ADD_OPTION(WITH_SIGNCODE "digitally sign files" OFF)
|
||||
- ADD_OPTION(WITH_RTC "enables run time checks for debug builds" OFF)
|
||||
- ADD_OPTION(WITH_ICONV "enables character set conversion" OFF)
|
||||
-ENDIF()
|
||||
-
|
||||
+ADD_OPTION(WITH_MYSQLCOMPAT "creates libmysql* symbolic links" OFF)
|
||||
|
|
@ -51,15 +51,23 @@ index 568e4f5..09b91c2 100644
|
|||
ADD_OPTION(WITH_UNIT_TESTS "build test suite" ON)
|
||||
ADD_OPTION(WITH_DYNCOL "Enables support of dynamic columns" ON)
|
||||
ADD_OPTION(WITH_EXTERNAL_ZLIB "Enables use of external zlib" OFF)
|
||||
@@ -238,13 +236,19 @@ IF(UNIX)
|
||||
${LIBSOCKET} ${LIBDL} ${LIBM} ${LIBPTHREAD})
|
||||
ADD_OPTION(WITH_CURL "Enables use of curl" ON)
|
||||
ADD_OPTION(WITH_SSL "Enables use of TLS/SSL library" ON)
|
||||
+ADD_OPTION(WITH_ICONV "enables character set conversion" OFF)
|
||||
###############
|
||||
|
||||
INCLUDE(${CC_SOURCE_DIR}/cmake/misc.cmake)
|
||||
@@ -224,14 +222,20 @@ IF(UNIX)
|
||||
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${LIBZ}
|
||||
${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD})
|
||||
SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${LIBZ}
|
||||
${LIBSOCKET} ${LIBDL} ${LIBM} ${LIBPTHREAD})
|
||||
- ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD})
|
||||
- #remove possible dups from required libraries
|
||||
- LIST(LENGTH CMAKE_REQUIRED_LIBRARIES rllength)
|
||||
- IF(${rllength} GREATER 0)
|
||||
- LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
|
||||
- ENDIF()
|
||||
+ ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBDL} ${LIBM} ${LIBPTHREAD})
|
||||
ENDIF()
|
||||
|
||||
+IF(MINGW)
|
||||
|
|
@ -96,7 +104,7 @@ index 4a82dd9..e280afb 100644
|
|||
ENDIF()
|
||||
SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
|
||||
diff --git a/cmake/symlink.cmake b/cmake/symlink.cmake
|
||||
index 117c164..4e4ad03 100644
|
||||
index c1c883d..cdca6dc 100644
|
||||
--- a/cmake/symlink.cmake
|
||||
+++ b/cmake/symlink.cmake
|
||||
@@ -7,7 +7,7 @@
|
||||
|
|
@ -109,7 +117,7 @@ index 117c164..4e4ad03 100644
|
|||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${symlink_name}
|
||||
diff --git a/include/ma_global.h b/include/ma_global.h
|
||||
index ee74ffa..ac26add 100644
|
||||
index e8ca7df..fbf6798 100644
|
||||
--- a/include/ma_global.h
|
||||
+++ b/include/ma_global.h
|
||||
@@ -33,7 +33,7 @@
|
||||
|
|
@ -121,7 +129,7 @@ index ee74ffa..ac26add 100644
|
|||
#endif
|
||||
|
||||
#include <ma_config.h>
|
||||
@@ -452,7 +452,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
|
||||
@@ -437,7 +437,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 */
|
||||
|
|
@ -131,7 +139,7 @@ index ee74ffa..ac26add 100644
|
|||
#define USE_MY_STAT_STRUCT /* For my_lib */
|
||||
#ifdef _MSC_VER
|
||||
diff --git a/include/mysql.h b/include/mysql.h
|
||||
index 17aab5e..49ac097 100644
|
||||
index 34f0985..111435b 100644
|
||||
--- a/include/mysql.h
|
||||
+++ b/include/mysql.h
|
||||
@@ -39,11 +39,7 @@ extern "C" {
|
||||
|
|
@ -146,7 +154,7 @@ index 17aab5e..49ac097 100644
|
|||
|
||||
#ifndef my_socket_defined
|
||||
#define my_socket_defined
|
||||
@@ -466,7 +462,7 @@ struct st_mysql_client_plugin
|
||||
@@ -467,7 +463,7 @@ struct st_mysql_client_plugin
|
||||
MYSQL_CLIENT_PLUGIN_HEADER
|
||||
};
|
||||
|
||||
|
|
@ -156,7 +164,7 @@ index 17aab5e..49ac097 100644
|
|||
int argc, ...);
|
||||
struct st_mysql_client_plugin * STDCALL
|
||||
diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h
|
||||
index ac29afd..2148787 100644
|
||||
index 72939d2..77e4538 100644
|
||||
--- a/include/mysql/client_plugin.h
|
||||
+++ b/include/mysql/client_plugin.h
|
||||
@@ -180,7 +180,7 @@ typedef struct st_mysql_client_plugin_REMOTEIO
|
||||
|
|
@ -169,10 +177,10 @@ index ac29afd..2148787 100644
|
|||
int argc, ...);
|
||||
|
||||
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
|
||||
index f406b37..0620391 100644
|
||||
index 14e34ab..17fcdda 100644
|
||||
--- a/libmariadb/CMakeLists.txt
|
||||
+++ b/libmariadb/CMakeLists.txt
|
||||
@@ -384,7 +384,7 @@ IF(CMAKE_GENERATOR MATCHES Xcode)
|
||||
@@ -386,7 +386,7 @@ IF(CMAKE_GENERATOR MATCHES Xcode)
|
||||
ENDIF()
|
||||
|
||||
IF(WIN32)
|
||||
|
|
@ -181,7 +189,7 @@ index f406b37..0620391 100644
|
|||
"FILE_TYPE:VFT_DLL"
|
||||
"SOURCE_FILE:libmariadb/libmariadb.c"
|
||||
"ORIGINAL_FILE_NAME:libmariadb.dll"
|
||||
@@ -395,17 +395,17 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE})
|
||||
@@ -398,17 +398,17 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE})
|
||||
TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
|
||||
|
||||
IF(UNIX)
|
||||
|
|
@ -206,7 +214,7 @@ index f406b37..0620391 100644
|
|||
|
||||
IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
|
||||
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
|
||||
@@ -415,15 +415,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
|
||||
@@ -418,15 +418,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
|
||||
CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR
|
||||
CMAKE_SYSTEM_NAME MATCHES "GNU")
|
||||
IF (NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN AND NOT WITH_MSAN)
|
||||
|
|
@ -225,7 +233,7 @@ index f406b37..0620391 100644
|
|||
|
||||
#
|
||||
# Installation
|
||||
@@ -435,14 +433,14 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
|
||||
@@ -438,8 +436,8 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
|
||||
# use mariadb client library we provide libmysql symlinks
|
||||
|
||||
IF(WITH_MYSQLCOMPAT)
|
||||
|
|
@ -233,8 +241,10 @@ index f406b37..0620391 100644
|
|||
- create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR})
|
||||
+ create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} mariadb ${INSTALL_BINDIR})
|
||||
+ create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} mariadb ${INSTALL_BINDIR})
|
||||
create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
|
||||
create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
|
||||
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})
|
||||
@@ -447,7 +445,7 @@ IF(WITH_MYSQLCOMPAT)
|
||||
ENDIF()
|
||||
|
||||
|
||||
|
|
@ -243,7 +253,7 @@ index f406b37..0620391 100644
|
|||
${CPACK_PACKAGE_VERSION_MAJOR}
|
||||
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
|
||||
|
||||
@@ -452,15 +450,19 @@ ENDIF()
|
||||
@@ -457,15 +455,19 @@ ENDIF()
|
||||
|
||||
INSTALL(TARGETS mariadbclient
|
||||
COMPONENT Development
|
||||
|
|
@ -267,21 +277,8 @@ index f406b37..0620391 100644
|
|||
CONFIGURATIONS Debug RelWithDebInfo
|
||||
COMPONENT Development)
|
||||
ENDIF()
|
||||
diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
|
||||
index 8c2a99b..efec140 100644
|
||||
--- a/libmariadb/mariadb_lib.c
|
||||
+++ b/libmariadb/mariadb_lib.c
|
||||
@@ -74,7 +74,7 @@
|
||||
#endif
|
||||
#include <mysql/client_plugin.h>
|
||||
#ifdef _WIN32
|
||||
-#include "Shlwapi.h"
|
||||
+#include "shlwapi.h"
|
||||
#define strncasecmp _strnicmp
|
||||
#endif
|
||||
|
||||
diff --git a/plugins/auth/CMakeLists.txt b/plugins/auth/CMakeLists.txt
|
||||
index 49b31c8..2737be8 100644
|
||||
index 2186f3b..fa5253f 100644
|
||||
--- a/plugins/auth/CMakeLists.txt
|
||||
+++ b/plugins/auth/CMakeLists.txt
|
||||
@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${AUTH_DIR})
|
||||
|
|
@ -294,7 +291,7 @@ index 49b31c8..2737be8 100644
|
|||
SET(CRYPT_LIBS crypt32 bcrypt)
|
||||
ELSEIF(WITH_SSL STREQUAL "OPENSSL")
|
||||
diff --git a/plugins/auth/caching_sha2_pw.c b/plugins/auth/caching_sha2_pw.c
|
||||
index d4dc0fc..047ff02 100644
|
||||
index 4bd45e8..225dcad 100644
|
||||
--- a/plugins/auth/caching_sha2_pw.c
|
||||
+++ b/plugins/auth/caching_sha2_pw.c
|
||||
@@ -20,7 +20,7 @@
|
||||
|
|
@ -307,7 +304,7 @@ index d4dc0fc..047ff02 100644
|
|||
#undef HAVE_OPENSSL
|
||||
#undef HAVE_GNUTLS
|
||||
diff --git a/plugins/auth/ed25519.c b/plugins/auth/ed25519.c
|
||||
index 3b33205..fd3eab0 100644
|
||||
index ed36ab0..73a74a6 100644
|
||||
--- a/plugins/auth/ed25519.c
|
||||
+++ b/plugins/auth/ed25519.c
|
||||
@@ -20,7 +20,7 @@
|
||||
|
|
@ -354,5 +351,5 @@ index 8c304c9..e2e9c5a 100644
|
|||
ENDIF()
|
||||
ENDIF()
|
||||
--
|
||||
2.28.0
|
||||
2.31.1
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
From 993fc8088fbe2fbf99cd19e560173152876fac5f Mon Sep 17 00:00:00 2001
|
||||
From: fjellfly <4467201+fjellfly@users.noreply.github.com>
|
||||
Date: Thu, 15 Apr 2021 12:48:31 +0200
|
||||
Subject: [PATCH 2/3] Fix cmake flow control statement
|
||||
|
||||
---
|
||||
cmake/ConnectorName.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake
|
||||
index b7bbbad..357b8ac 100644
|
||||
--- a/cmake/ConnectorName.cmake
|
||||
+++ b/cmake/ConnectorName.cmake
|
||||
@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
|
||||
SET(MACHINE_NAME "x64")
|
||||
ELSE()
|
||||
SET(MACHINE_NAME "32")
|
||||
- END()
|
||||
+ ENDIF()
|
||||
ENDIF()
|
||||
|
||||
SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
From 986f8b78bdb95357ff16951161f356e270bde222 Mon Sep 17 00:00:00 2001
|
||||
From baaaec2cd485a409904c088f75ec106eb1200017 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 12 Sep 2020 20:30:49 +0200
|
||||
Subject: [PATCH 2/2] Enable pkg-config for mingw-w64 build
|
||||
Subject: [PATCH 3/3] Enable pkg-config for mingw-w64 build
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 09b91c2..9cf2ce7 100644
|
||||
index 640670f..5d7fb58 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -407,7 +407,7 @@ ENDIF()
|
||||
@@ -396,7 +396,7 @@ ENDIF()
|
||||
INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt)
|
||||
ADD_SUBDIRECTORY(include)
|
||||
ADD_SUBDIRECTORY(libmariadb)
|
||||
|
|
@ -21,5 +21,5 @@ index 09b91c2..9cf2ce7 100644
|
|||
ENDIF()
|
||||
|
||||
--
|
||||
2.28.0
|
||||
2.31.1
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
# All patches are managed at https://github.com/Martchus/mariadb-connector-c
|
||||
|
||||
pkgname=mingw-w64-mariadb-connector-c
|
||||
pkgver=3.1.9
|
||||
pkgver=3.1.12
|
||||
pkgrel=1
|
||||
pkgdesc='MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases (mingw-w64)'
|
||||
arch=('any')
|
||||
|
|
@ -22,11 +22,13 @@ options=('!strip' '!buildflags' 'staticlibs')
|
|||
source=(
|
||||
"http://archive.mariadb.org/connector-c-$pkgver/mariadb-connector-c-$pkgver-src.tar.gz"
|
||||
'0001-Fix-mingw-w64-build.patch'
|
||||
'0002-Enable-pkg-config-for-mingw-w64-build.patch'
|
||||
'0002-Fix-cmake-flow-control-statement.patch'
|
||||
'0003-Enable-pkg-config-for-mingw-w64-build.patch'
|
||||
)
|
||||
sha256sums=('108d99bf2add434dcb3bd9526ba1d89a2b9a943b62dcd9d0a41fcbef8ffbf2c7'
|
||||
'd97e7c6ca57ee9b81d67a37e63733d1a4f77067fcf3facd2cd36c9fb08627d53'
|
||||
'7ccbafee1f63c510234038ed21448a40b9cf6c2361359502a8ce67122883e2e7')
|
||||
sha256sums=('2f5ae14708b4813e4ff6857d152c22e6fc0e551c9fa743c1ef81a68e3254fe63'
|
||||
'706024045a87f70250f38d2eb928fc4ead0620485d5850de403330bc734efa2a'
|
||||
'76f56754d3eaaa088fa7411b730e1bc20e891c6476c0bb1f9b6b9f3eb13307ca'
|
||||
'4da0dde6c8b93e2ad85e217f063fad3791d917820a39c6976625105a1fc2121a')
|
||||
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue