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

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

This commit is contained in:
Martchus 2022-08-02 18:48:33 +02:00
parent 6d9159c41a
commit eee63ad24d
3 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From aa6cb1ffc0a005e37d22b14faa3e31b642b33d7c Mon Sep 17 00:00:00 2001 From 16d52c5ed320dcd7912d4e23c538608a42f32d04 Mon Sep 17 00:00:00 2001
From: Tilmann Meyer <allescrafterx@gmail.com> From: Tilmann Meyer <allescrafterx@gmail.com>
Date: Fri, 17 Apr 2020 02:12:23 +0200 Date: Fri, 17 Apr 2020 02:12:23 +0200
Subject: [PATCH 1/2] Fix mingw-w64 build 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(-) 9 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index d245b6e..93bf967 100644 index 2584e93..6c67324 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -3,6 +3,9 @@ @@ -3,6 +3,9 @@
@ -55,10 +55,10 @@ index d245b6e..93bf967 100644
############### ###############
INCLUDE(${CC_SOURCE_DIR}/cmake/misc.cmake) INCLUDE(${CC_SOURCE_DIR}/cmake/misc.cmake)
@@ -249,14 +248,20 @@ IF(UNIX) @@ -251,14 +250,20 @@ IF(UNIX)
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${LIBZ} SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${ZLIB_LIBRARY}
${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD}) ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD})
SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${LIBZ} SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBNSL} ${LIBBIND} ${LIBICONV}
- ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD}) - ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD})
- #remove possible dups from required libraries - #remove possible dups from required libraries
- LIST(LENGTH CMAKE_REQUIRED_LIBRARIES rllength) - LIST(LENGTH CMAKE_REQUIRED_LIBRARIES rllength)
@ -66,14 +66,14 @@ index d245b6e..93bf967 100644
- LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES) - LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
- ENDIF() - ENDIF()
+ ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBDL} ${LIBM} ${LIBPTHREAD}) + ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBDL} ${LIBM} ${LIBPTHREAD})
+ENDIF() ENDIF()
+
+IF(MINGW) +IF(MINGW)
+ FIND_PACKAGE(Threads) + FIND_PACKAGE(Threads)
+ LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBPTHREAD}) + LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBPTHREAD})
+ LIST(APPEND SYSTEM_LIBS ${LIBPTHREAD}) + LIST(APPEND SYSTEM_LIBS ${LIBPTHREAD})
ENDIF() +ENDIF()
+
+#remove possible dups from required libraries +#remove possible dups from required libraries
+LIST(LENGTH CMAKE_REQUIRED_LIBRARIES rllength) +LIST(LENGTH CMAKE_REQUIRED_LIBRARIES rllength)
+IF(${rllength} GREATER 0) +IF(${rllength} GREATER 0)
@ -116,10 +116,10 @@ index c1c883d..cdca6dc 100644
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${symlink_name} OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${symlink_name}
diff --git a/include/ma_global.h b/include/ma_global.h diff --git a/include/ma_global.h b/include/ma_global.h
index e8ca7df..fbf6798 100644 index d6077f3..d68f921 100644
--- a/include/ma_global.h --- a/include/ma_global.h
+++ b/include/ma_global.h +++ b/include/ma_global.h
@@ -33,7 +33,7 @@ @@ -34,7 +34,7 @@
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
#endif #endif
@ -128,7 +128,7 @@ index e8ca7df..fbf6798 100644
#endif #endif
#include <ma_config.h> #include <ma_config.h>
@@ -437,7 +437,7 @@ typedef SOCKET_SIZE_TYPE size_socket; @@ -440,7 +440,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define NO_PISAM /* Not needed anymore */ #define NO_PISAM /* Not needed anymore */
#define NO_MISAM /* Not needed anymore */ #define NO_MISAM /* Not needed anymore */
#define NO_HASH /* Not needed anymore */ #define NO_HASH /* Not needed anymore */
@ -138,7 +138,7 @@ index e8ca7df..fbf6798 100644
#define USE_MY_STAT_STRUCT /* For my_lib */ #define USE_MY_STAT_STRUCT /* For my_lib */
#ifdef _MSC_VER #ifdef _MSC_VER
diff --git a/include/mysql.h b/include/mysql.h diff --git a/include/mysql.h b/include/mysql.h
index b66cf17..354d3db 100644 index 8a3884c..a2bc3cd 100644
--- a/include/mysql.h --- a/include/mysql.h
+++ b/include/mysql.h +++ b/include/mysql.h
@@ -39,11 +39,7 @@ extern "C" { @@ -39,11 +39,7 @@ extern "C" {
@ -153,7 +153,7 @@ index b66cf17..354d3db 100644
#ifndef my_socket_defined #ifndef my_socket_defined
#define my_socket_defined #define my_socket_defined
@@ -468,7 +464,7 @@ struct st_mysql_client_plugin @@ -471,7 +467,7 @@ struct st_mysql_client_plugin
MYSQL_CLIENT_PLUGIN_HEADER MYSQL_CLIENT_PLUGIN_HEADER
}; };
@ -163,10 +163,10 @@ index b66cf17..354d3db 100644
int argc, ...); int argc, ...);
struct st_mysql_client_plugin * STDCALL struct st_mysql_client_plugin * STDCALL
diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h
index 72939d2..77e4538 100644 index 262fd4a..9a0e1e6 100644
--- a/include/mysql/client_plugin.h --- a/include/mysql/client_plugin.h
+++ b/include/mysql/client_plugin.h +++ b/include/mysql/client_plugin.h
@@ -180,7 +180,7 @@ typedef struct st_mysql_client_plugin_REMOTEIO @@ -194,7 +194,7 @@ typedef struct st_mysql_client_plugin_REMOTEIO
@retval @retval
a pointer to the loaded plugin, or NULL in case of a failure a pointer to the loaded plugin, or NULL in case of a failure
*/ */
@ -176,10 +176,10 @@ index 72939d2..77e4538 100644
int argc, ...); int argc, ...);
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
index 4e46d98..b9a1618 100644 index 7faf827..43ab846 100644
--- a/libmariadb/CMakeLists.txt --- a/libmariadb/CMakeLists.txt
+++ b/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt
@@ -393,7 +393,7 @@ ENDIF() @@ -405,7 +405,7 @@ ENDIF()
FILE(WRITE ${CC_BINARY_DIR}/manpages.list "${MARIADB_LIB_SYMBOLS};${MYSQL_LIB_SYMBOLS}") FILE(WRITE ${CC_BINARY_DIR}/manpages.list "${MARIADB_LIB_SYMBOLS};${MYSQL_LIB_SYMBOLS}")
IF(WIN32) IF(WIN32)
@ -188,7 +188,7 @@ index 4e46d98..b9a1618 100644
"FILE_TYPE:VFT_DLL" "FILE_TYPE:VFT_DLL"
"SOURCE_FILE:libmariadb/libmariadb.c" "SOURCE_FILE:libmariadb/libmariadb.c"
"ORIGINAL_FILE_NAME:libmariadb.dll" "ORIGINAL_FILE_NAME:libmariadb.dll"
@@ -405,30 +405,28 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) @@ -417,30 +417,28 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE})
TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
IF(UNIX) IF(UNIX)
@ -228,7 +228,7 @@ index 4e46d98..b9a1618 100644
# #
# Installation # Installation
@@ -440,8 +438,8 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake) @@ -452,8 +450,8 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
# use mariadb client library we provide libmysql symlinks # use mariadb client library we provide libmysql symlinks
IF(WITH_MYSQLCOMPAT) IF(WITH_MYSQLCOMPAT)
@ -239,7 +239,7 @@ index 4e46d98..b9a1618 100644
IF(NOT CMAKE_SYSTEM_NAME MATCHES AIX) IF(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
@@ -450,7 +448,7 @@ ENDIF() @@ -462,7 +460,7 @@ ENDIF()
create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
@ -248,9 +248,9 @@ index 4e46d98..b9a1618 100644
${CPACK_PACKAGE_VERSION_MAJOR} ${CPACK_PACKAGE_VERSION_MAJOR}
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}) SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
@@ -462,17 +460,17 @@ INSTALL(TARGETS mariadbclient @@ -479,18 +477,18 @@ INSTALL(TARGETS libmariadb
COMPONENT Development DESTINATION ${INSTALL_LIBDIR})
DESTINATION ${INSTALL_LIBDIR}) ELSE()
# in cmake 3.12+ we can use # in cmake 3.12+ we can use
-#INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} -#INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
+#INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} +#INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
@ -262,6 +262,7 @@ index 4e46d98..b9a1618 100644
-INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} -INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
+INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} +INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
COMPONENT Development NAMELINK_ONLY) COMPONENT Development NAMELINK_ONLY)
ENDIF()
IF(MSVC) IF(MSVC)
# On Windows, install PDB # On Windows, install PDB
@ -296,5 +297,5 @@ index 8c304c9..e2e9c5a 100644
ENDIF() ENDIF()
ENDIF() ENDIF()
-- --
2.35.1 2.37.1

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

@ -1,18 +1,18 @@
From d9eb742e22a1a72b4b5c1b09f6a7b6b606c5613e Mon Sep 17 00:00:00 2001 From b975245b5d845d38b95a970afbf2bb1fc9ac1695 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sat, 12 Sep 2020 20:30:49 +0200 Date: Sat, 12 Sep 2020 20:30:49 +0200
Subject: [PATCH 2/2] Enable pkg-config for mingw-w64 build Subject: [PATCH 2/2] Enable pkg-config for mingw-w64 build
--- ---
CMakeLists.txt | 2 +- CMakeLists.txt | 2 +-
libmariadb/CMakeLists.txt | 10 ++-------- libmariadb/CMakeLists.txt | 13 ++++---------
2 files changed, 3 insertions(+), 9 deletions(-) 2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93bf967..247d361 100644 index 6c67324..c7af878 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -422,7 +422,7 @@ ENDIF() @@ -424,7 +424,7 @@ ENDIF()
INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt) INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt)
ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(libmariadb) ADD_SUBDIRECTORY(libmariadb)
@ -22,14 +22,21 @@ index 93bf967..247d361 100644
ENDIF() ENDIF()
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
index b9a1618..5f8c657 100644 index 43ab846..9114e89 100644
--- a/libmariadb/CMakeLists.txt --- a/libmariadb/CMakeLists.txt
+++ b/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt
@@ -459,14 +459,8 @@ ENDIF() @@ -471,19 +471,14 @@ ENDIF()
INSTALL(TARGETS mariadbclient INSTALL(TARGETS mariadbclient
COMPONENT Development COMPONENT Development
DESTINATION ${INSTALL_LIBDIR}) DESTINATION ${INSTALL_LIBDIR})
-# in cmake 3.12+ we can use -IF(WIN32)
-INSTALL(TARGETS libmariadb
+IF(WIN32 AND NOT MINGW)
+INSTALL(TARGETS mariadb
COMPONENT SharedLibraries
DESTINATION ${INSTALL_LIBDIR})
ELSE()
# in cmake 3.12+ we can use
-#INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} -#INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
-# COMPONENT SharedLibraries NAMELINK_COMPONENT Development) -# COMPONENT SharedLibraries NAMELINK_COMPONENT Development)
-# but as long as we build on CentOS 7 with its cmake 2.8.12.2 we have to use -# but as long as we build on CentOS 7 with its cmake 2.8.12.2 we have to use
@ -39,9 +46,9 @@ index b9a1618..5f8c657 100644
- COMPONENT Development NAMELINK_ONLY) - COMPONENT Development NAMELINK_ONLY)
+INSTALL(TARGETS mariadb RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} LIBRARY DESTINATION ${INSTALL_LIBDIR} +INSTALL(TARGETS mariadb RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} LIBRARY DESTINATION ${INSTALL_LIBDIR}
+ COMPONENT SharedLibraries NAMELINK_COMPONENT Development) + COMPONENT SharedLibraries NAMELINK_COMPONENT Development)
ENDIF()
IF(MSVC) IF(MSVC)
# On Windows, install PDB
-- --
2.35.1 2.37.1

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

@ -7,7 +7,7 @@
# All patches are managed at https://github.com/Martchus/mariadb-connector-c # All patches are managed at https://github.com/Martchus/mariadb-connector-c
pkgname=mingw-w64-mariadb-connector-c pkgname=mingw-w64-mariadb-connector-c
pkgver=3.2.6 pkgver=3.3.1
pkgrel=1 pkgrel=1
pkgdesc='MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases (mingw-w64)' pkgdesc='MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases (mingw-w64)'
arch=('any') arch=('any')
@ -24,9 +24,9 @@ source=(
'0001-Fix-mingw-w64-build.patch' '0001-Fix-mingw-w64-build.patch'
'0002-Enable-pkg-config-for-mingw-w64-build.patch' '0002-Enable-pkg-config-for-mingw-w64-build.patch'
) )
sha256sums=('d9aee070e1d954074a70eff1cfd2d6c6bc5d190dc00075975a55d4f3e1ac20c5' sha256sums=('be0c15661d5984afdce313dd760cd725806c59f7e9891e344e4871c1805395e9'
'88912c97b33ab86835f10f37ce7a67e11d489dedfd65d0696aba85680d0d3805' '148983c92018f684f6e351e23b273ab3f4f2a51a5e65bce6150c0ddd8dc30654'
'c405499b0812a2792a2c6a419b2061c8e280bda74049dba9a018576ed1a332e6') '6bd3ed4c80a2756cc59129011b95e67cacb3b64832b48b9898aa5cb44dab6214')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'