Martchus
/
PKGBUILDs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update mingw-w64-mariadb-connector-c to 3.3.7

This commit is contained in:
Martchus 2023-11-07 13:58:00 +01:00
parent 54287988e4
commit cd5922c408
3 changed files with 38 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
mariadb-connector-c/mingw-w64/0001-Fix-mingw-w64-build.patch
View File

@ -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

24
mariadb-connector-c/mingw-w64/0002-Enable-pkg-config-for-mingw-w64-build.patch
View File

@ -1,31 +1,17 @@
From b975245b5d845d38b95a970afbf2bb1fc9ac1695 Mon Sep 17 00:00:00 2001
From 5857b1de7b86f55343e16ade0089abe12ce2d0c4 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
---
CMakeLists.txt | 2 +-
libmariadb/CMakeLists.txt | 13 ++++---------
2 files changed, 5 insertions(+), 10 deletions(-)
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c67324..c7af878 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -424,7 +424,7 @@ ENDIF()
INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(libmariadb)
-IF(NOT WIN32)
+IF(NOT WIN32 OR MINGW)
ADD_SUBDIRECTORY(mariadb_config)
ENDIF()
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
index 43ab846..9114e89 100644
index d6e23e56..67a93e31 100644
--- a/libmariadb/CMakeLists.txt
+++ b/libmariadb/CMakeLists.txt
@@ -471,19 +471,14 @@ ENDIF()
@@ -501,19 +501,14 @@ ENDIF()
INSTALL(TARGETS mariadbclient
COMPONENT Development
DESTINATION ${INSTALL_LIBDIR})
@ -50,5 +36,5 @@ index 43ab846..9114e89 100644
IF(MSVC)
--
2.37.1
2.42.0

18
mariadb-connector-c/mingw-w64/PKGBUILD
View File

@ -7,8 +7,8 @@
# All patches are managed at https://github.com/Martchus/mariadb-connector-c
pkgname=mingw-w64-mariadb-connector-c
pkgver=3.3.1
pkgrel=2
pkgver=3.3.7
pkgrel=1
pkgdesc='MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases (mingw-w64)'
arch=('any')
url='https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c'
@ -19,14 +19,12 @@ provides=("mingw-w64-libmariadbclient=$pkgver")
depends=('mingw-w64-crt' 'mingw-w64-openssl' 'mingw-w64-zlib' 'mingw-w64-curl')
makedepends=('mingw-w64-cmake' 'ninja')
options=('!strip' '!buildflags' 'staticlibs')
source=(
"https://github.com/mariadb-corporation/mariadb-connector-c/archive/refs/tags/v$pkgver.tar.gz"
'0001-Fix-mingw-w64-build.patch'
'0002-Enable-pkg-config-for-mingw-w64-build.patch'
)
sha256sums=('be0c15661d5984afdce313dd760cd725806c59f7e9891e344e4871c1805395e9'
'148983c92018f684f6e351e23b273ab3f4f2a51a5e65bce6150c0ddd8dc30654'
'6bd3ed4c80a2756cc59129011b95e67cacb3b64832b48b9898aa5cb44dab6214')
source=("https://github.com/mariadb-corporation/mariadb-connector-c/archive/refs/tags/v$pkgver.tar.gz"
'0001-Fix-mingw-w64-build.patch'
'0002-Enable-pkg-config-for-mingw-w64-build.patch')
sha256sums=('029b91473a42f822611e92e01b7af05c3ed8def7ab14665ffbb78947ccf0d6a5'
'a90e01465507c1700cca32f4ed1e1661c158ecb1e3028c6f27cebed5c551d4d0'
'335dbd894c789c4dea52fe0e7e3bc5b061d2ef037c5adbbc4405a65590ee5ce5')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'