Compare commits
1 Commits
Author | SHA1 | Date |
---|---|---|
Martchus | 051f572ec4 |
|
@ -1,4 +1,4 @@
|
||||||
From 16d52c5ed320dcd7912d4e23c538608a42f32d04 Mon Sep 17 00:00:00 2001
|
From 7ff32466724a28981aefe5270647adba8f20f606 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 2584e93..6c67324 100644
|
index 6903604..f620818 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -3,6 +3,9 @@
|
@@ -3,6 +3,9 @@
|
||||||
|
@ -55,7 +55,7 @@ index 2584e93..6c67324 100644
|
||||||
###############
|
###############
|
||||||
|
|
||||||
INCLUDE(${CC_SOURCE_DIR}/cmake/misc.cmake)
|
INCLUDE(${CC_SOURCE_DIR}/cmake/misc.cmake)
|
||||||
@@ -251,14 +250,20 @@ IF(UNIX)
|
@@ -254,14 +253,20 @@ IF(UNIX)
|
||||||
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${ZLIB_LIBRARY}
|
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}
|
SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBNSL} ${LIBBIND} ${LIBICONV}
|
||||||
|
@ -116,19 +116,19 @@ 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 d6077f3..d68f921 100644
|
index b8ef7e1..408a1b8 100644
|
||||||
--- a/include/ma_global.h
|
--- a/include/ma_global.h
|
||||||
+++ b/include/ma_global.h
|
+++ b/include/ma_global.h
|
||||||
@@ -34,7 +34,7 @@
|
@@ -35,7 +35,7 @@
|
||||||
#define snprintf _snprintf
|
|
||||||
#endif
|
#endif
|
||||||
|
#define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
|
||||||
#endif
|
#endif
|
||||||
-#define STDCALL __stdcall
|
-#define STDCALL __stdcall
|
||||||
+#define STDCALL
|
+#define STDCALL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <ma_config.h>
|
#include <ma_config.h>
|
||||||
@@ -440,7 +440,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
|
@@ -441,7 +441,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 d6077f3..d68f921 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 8a3884c..a2bc3cd 100644
|
index ba3063d..a5bdab7 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 8a3884c..a2bc3cd 100644
|
||||||
|
|
||||||
#ifndef my_socket_defined
|
#ifndef my_socket_defined
|
||||||
#define my_socket_defined
|
#define my_socket_defined
|
||||||
@@ -471,7 +467,7 @@ struct st_mysql_client_plugin
|
@@ -473,7 +469,7 @@ struct st_mysql_client_plugin
|
||||||
MYSQL_CLIENT_PLUGIN_HEADER
|
MYSQL_CLIENT_PLUGIN_HEADER
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -176,10 +176,10 @@ index 262fd4a..9a0e1e6 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 7faf827..43ab846 100644
|
index 070fdc9..f0a2f56 100644
|
||||||
--- a/libmariadb/CMakeLists.txt
|
--- a/libmariadb/CMakeLists.txt
|
||||||
+++ b/libmariadb/CMakeLists.txt
|
+++ b/libmariadb/CMakeLists.txt
|
||||||
@@ -405,7 +405,7 @@ ENDIF()
|
@@ -426,7 +426,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 7faf827..43ab846 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"
|
||||||
@@ -417,30 +417,28 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE})
|
@@ -438,30 +438,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 7faf827..43ab846 100644
|
||||||
|
|
||||||
#
|
#
|
||||||
# Installation
|
# Installation
|
||||||
@@ -452,8 +450,8 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
|
@@ -473,8 +471,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 7faf827..43ab846 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})
|
||||||
@@ -462,7 +460,7 @@ ENDIF()
|
@@ -483,7 +481,7 @@ ENDIF()
|
||||||
|
|
||||||
create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
|
create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
|
||||||
|
|
||||||
|
@ -248,7 +248,7 @@ index 7faf827..43ab846 100644
|
||||||
${CPACK_PACKAGE_VERSION_MAJOR}
|
${CPACK_PACKAGE_VERSION_MAJOR}
|
||||||
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
|
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
|
||||||
|
|
||||||
@@ -479,18 +477,18 @@ INSTALL(TARGETS libmariadb
|
@@ -500,18 +498,18 @@ INSTALL(TARGETS libmariadb
|
||||||
DESTINATION ${INSTALL_LIBDIR})
|
DESTINATION ${INSTALL_LIBDIR})
|
||||||
ELSE()
|
ELSE()
|
||||||
# in cmake 3.12+ we can use
|
# in cmake 3.12+ we can use
|
||||||
|
@ -272,7 +272,7 @@ index 7faf827..43ab846 100644
|
||||||
COMPONENT Development)
|
COMPONENT Development)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
diff --git a/plugins/auth/CMakeLists.txt b/plugins/auth/CMakeLists.txt
|
diff --git a/plugins/auth/CMakeLists.txt b/plugins/auth/CMakeLists.txt
|
||||||
index e5448f8..ae2cf27 100644
|
index 0612f08..0672b3b 100644
|
||||||
--- a/plugins/auth/CMakeLists.txt
|
--- a/plugins/auth/CMakeLists.txt
|
||||||
+++ b/plugins/auth/CMakeLists.txt
|
+++ b/plugins/auth/CMakeLists.txt
|
||||||
@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${AUTH_DIR})
|
@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${AUTH_DIR})
|
||||||
|
@ -297,5 +297,5 @@ index 8c304c9..e2e9c5a 100644
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
--
|
--
|
||||||
2.37.1
|
2.38.1
|
||||||
|
|
||||||
|
|
|
@ -1,31 +1,17 @@
|
||||||
From b975245b5d845d38b95a970afbf2bb1fc9ac1695 Mon Sep 17 00:00:00 2001
|
From 871e5ed7064768383025271669e7d0cded12ca6c 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 +-
|
|
||||||
libmariadb/CMakeLists.txt | 13 ++++---------
|
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
|
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
|
||||||
index 43ab846..9114e89 100644
|
index f0a2f56..a0d2e2c 100644
|
||||||
--- a/libmariadb/CMakeLists.txt
|
--- a/libmariadb/CMakeLists.txt
|
||||||
+++ b/libmariadb/CMakeLists.txt
|
+++ b/libmariadb/CMakeLists.txt
|
||||||
@@ -471,19 +471,14 @@ ENDIF()
|
@@ -492,19 +492,14 @@ ENDIF()
|
||||||
INSTALL(TARGETS mariadbclient
|
INSTALL(TARGETS mariadbclient
|
||||||
COMPONENT Development
|
COMPONENT Development
|
||||||
DESTINATION ${INSTALL_LIBDIR})
|
DESTINATION ${INSTALL_LIBDIR})
|
||||||
|
@ -50,5 +36,5 @@ index 43ab846..9114e89 100644
|
||||||
|
|
||||||
IF(MSVC)
|
IF(MSVC)
|
||||||
--
|
--
|
||||||
2.37.1
|
2.38.1
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
# 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.3.1
|
pkgver=3.3.2
|
||||||
pkgrel=2
|
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')
|
||||||
url='https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c'
|
url='https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c'
|
||||||
|
@ -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=('be0c15661d5984afdce313dd760cd725806c59f7e9891e344e4871c1805395e9'
|
sha256sums=('fb1a37a5bfeccc3e95bb455f5a5523c57d2c4337a204e28d1e23af5cbbe848a9'
|
||||||
'148983c92018f684f6e351e23b273ab3f4f2a51a5e65bce6150c0ddd8dc30654'
|
'4bd32bec5de6941d4a464b106aa6f8ca744cb6652c2632d24d3506dc8348691a'
|
||||||
'6bd3ed4c80a2756cc59129011b95e67cacb3b64832b48b9898aa5cb44dab6214')
|
'47d40fbcdc3364d8f139931fde90b5b7e0ff5f36e8b24445426ba1c2d227e625')
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue