Update mingw-w64-mariadb-connector-c
This commit is contained in:
parent
051009e3dc
commit
225bc61982
|
|
@ -1,114 +1,17 @@
|
|||
--- libmariadb/CMakeLists.txt.orig 2016-04-12 12:34:11.000000000 +0200
|
||||
+++ libmariadb/CMakeLists.txt 2016-05-31 22:48:06.757700300 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
|
||||
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
|
||||
${ZLIB_INC}
|
||||
${CMAKE_SOURCE_DIR}/libmariadb)
|
||||
-
|
||||
+
|
||||
ADD_DEFINITIONS(-D ENABLED_LOCAL_INFILE)
|
||||
ADD_DEFINITIONS(-D HAVE_COMPRESS)
|
||||
ADD_DEFINITIONS(-D LIBMARIADB)
|
||||
@@ -239,15 +239,15 @@
|
||||
|
||||
FILE(WRITE ${EXPORT_FILE} ${EXPORT_CONTENT})
|
||||
|
||||
-SET(LIBMARIADB_SOURCES
|
||||
-array.c
|
||||
+SET(LIBMARIADB_SOURCES
|
||||
+array.c
|
||||
ma_dyncol.c
|
||||
-bchange.c
|
||||
-bmove.c
|
||||
-bmove_upp.c
|
||||
+bchange.c
|
||||
+bmove.c
|
||||
+bmove_upp.c
|
||||
my_charset.c
|
||||
hash.c
|
||||
-violite.c
|
||||
+violite.c
|
||||
net.c
|
||||
charset.c
|
||||
ma_time.c
|
||||
@@ -257,27 +257,27 @@
|
||||
my_vsnprintf.c
|
||||
errors.c
|
||||
getopt1.c
|
||||
-getopt.c
|
||||
+getopt.c
|
||||
int2str.c
|
||||
is_prefix.c
|
||||
libmariadb.c
|
||||
list.c
|
||||
llstr.c
|
||||
-longlong2str.c
|
||||
-mf_dirname.c
|
||||
-mf_fn_ext.c
|
||||
+longlong2str.c
|
||||
+mf_dirname.c
|
||||
+mf_fn_ext.c
|
||||
mf_format.c
|
||||
-mf_loadpath.c
|
||||
-mf_pack.c
|
||||
+mf_loadpath.c
|
||||
+mf_pack.c
|
||||
mf_path.c
|
||||
mf_unixpath.c
|
||||
mf_wcomp.c
|
||||
-mulalloc.c
|
||||
+mulalloc.c
|
||||
my_alloc.c
|
||||
my_compress.c
|
||||
my_context.c
|
||||
my_div.c
|
||||
-my_error.c
|
||||
+my_error.c
|
||||
my_fopen.c
|
||||
my_fstream.c
|
||||
my_getwd.c
|
||||
@@ -288,7 +288,7 @@
|
||||
my_net.c
|
||||
my_once.c
|
||||
my_open.c
|
||||
-my_port.c
|
||||
+my_port.c
|
||||
my_pthread.c
|
||||
my_read.c
|
||||
my_realloc.c
|
||||
@@ -298,10 +298,10 @@
|
||||
my_thr_init.c
|
||||
my_write.c
|
||||
mysql_async.c
|
||||
-password.c
|
||||
+password.c
|
||||
str2int.c
|
||||
strcend.c
|
||||
-strcont.c
|
||||
+strcont.c
|
||||
strend.c
|
||||
strfill.c
|
||||
string.c
|
||||
@@ -310,7 +310,7 @@
|
||||
strmov.c
|
||||
strnmov.c
|
||||
strtoll.c
|
||||
-strtoull.c
|
||||
+strtoull.c
|
||||
strxmov.c
|
||||
strxnmov.c
|
||||
thr_mutex.c
|
||||
@@ -335,7 +335,7 @@
|
||||
LINK_LIBRARIES(${ZLIB_LIBRARY})
|
||||
ELSE()
|
||||
SET(ZLIB_SOURCES
|
||||
- ../zlib/adler32.c
|
||||
+ ../zlib/adler32.c
|
||||
../zlib/compress.c
|
||||
../zlib/crc32.c
|
||||
../zlib/deflate.c
|
||||
@@ -356,7 +356,7 @@
|
||||
From 9af2954796a6f705b0a4f5ce415ce7bdfa3ab5ce Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 17 Sep 2016 16:41:12 +0200
|
||||
Subject: [PATCH 1/3] Fix libnames for mingw-w64
|
||||
|
||||
---
|
||||
libmariadb/CMakeLists.txt | 39 ++++++++++++++++++++-------------------
|
||||
1 file changed, 20 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
|
||||
index f07dc02..ea58fd4 100644
|
||||
--- a/libmariadb/CMakeLists.txt
|
||||
+++ b/libmariadb/CMakeLists.txt
|
||||
@@ -362,7 +362,7 @@ SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES} ${ZLIB_SOURCES})
|
||||
ENDIF()
|
||||
|
||||
IF(WIN32)
|
||||
|
|
@ -117,16 +20,7 @@
|
|||
"FILE_TYPE:VFT_DLL"
|
||||
"SOURCE_FILE:libmariadb/libmariadb.c"
|
||||
"ORIGINAL_FILE_NAME:libmariadb.dll"
|
||||
@@ -368,7 +368,7 @@
|
||||
"FILE_DESCRIPTION:Static lib for client/server communication")
|
||||
ENDIF()
|
||||
|
||||
-# CREATE OBJECT LIBRARY
|
||||
+# CREATE OBJECT LIBRARY
|
||||
ADD_LIBRARY(mariadb_obj OBJECT ${LIBMARIADB_SOURCES})
|
||||
IF(UNIX)
|
||||
SET_TARGET_PROPERTIES(mariadb_obj PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
|
||||
@@ -384,23 +384,24 @@
|
||||
@@ -390,23 +390,24 @@ ENDIF()
|
||||
ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
|
||||
TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
|
||||
|
||||
|
|
@ -159,7 +53,7 @@
|
|||
${CPACK_PACKAGE_VERSION_MAJOR}
|
||||
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
|
||||
|
||||
@@ -413,24 +414,24 @@
|
||||
@@ -419,20 +420,20 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/symlink.cmake)
|
||||
# There are still several projects which don't make use
|
||||
# of the config program. To make sure these programs can
|
||||
# use mariadb client library we provide libmysql symlinks
|
||||
|
|
@ -190,8 +84,6 @@
|
|||
|
||||
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
|
||||
-INSTALL(FILES
|
||||
+INSTALL(FILES
|
||||
${CMAKE_BINARY_DIR}/include/my_config.h
|
||||
${CMAKE_BINARY_DIR}/include/mysql_version.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From 7cfcfdc3b258bbbe67e29997899c80c2c7bfe2bc Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 17 Sep 2016 16:44:14 +0200
|
||||
Subject: [PATCH 2/3] Fix _SIZE_T_DEFINED under mingw-w64
|
||||
|
||||
---
|
||||
include/my_global.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/my_global.h b/include/my_global.h
|
||||
index 176404c..1905544 100644
|
||||
--- a/include/my_global.h
|
||||
+++ b/include/my_global.h
|
||||
@@ -450,7 +450,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 */
|
||||
-#ifdef _WIN32
|
||||
+#if defined(_WIN32) && !defined(__MINGW32__)
|
||||
#define NO_DIR_LIBRARY /* Not standar dir-library */
|
||||
#define USE_MY_STAT_STRUCT /* For my_lib */
|
||||
#ifdef _MSC_VER
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
From cc7d7a770c85fc208d4d727a3d9efafd8316db70 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sat, 17 Sep 2016 16:51:15 +0200
|
||||
Subject: [PATCH 3/3] Use fopen rather than fopen_s for XP compatibility
|
||||
|
||||
---
|
||||
libmariadb/dbug.c | 4 ----
|
||||
libmariadb/my_fopen.c | 4 ----
|
||||
2 files changed, 8 deletions(-)
|
||||
|
||||
diff --git a/libmariadb/dbug.c b/libmariadb/dbug.c
|
||||
index cd4a0f1..abca4ae 100644
|
||||
--- a/libmariadb/dbug.c
|
||||
+++ b/libmariadb/dbug.c
|
||||
@@ -2051,11 +2051,7 @@ static void DBUGOpenFile(CODE_STATE *cs,
|
||||
}
|
||||
else
|
||||
{
|
||||
-#ifdef _WIN32
|
||||
- if (fopen_s(&fp, name, append ? "a+" : "w"))
|
||||
-#else
|
||||
if (!(fp= fopen(name, append ? "a+" : "w")))
|
||||
-#endif
|
||||
{
|
||||
(void) fprintf(stderr, ERR_OPEN, cs->process, name);
|
||||
perror("");
|
||||
diff --git a/libmariadb/my_fopen.c b/libmariadb/my_fopen.c
|
||||
index 5c0fb40..ad2deb9 100644
|
||||
--- a/libmariadb/my_fopen.c
|
||||
+++ b/libmariadb/my_fopen.c
|
||||
@@ -36,11 +36,7 @@ FILE *my_fopen(const char *FileName, int Flags, myf MyFlags)
|
||||
FileName, Flags, MyFlags));
|
||||
|
||||
make_ftype(type,Flags);
|
||||
-#ifdef _WIN32
|
||||
- if (fopen_s(&fd, FileName, type) == 0)
|
||||
-#else
|
||||
if ((fd = fopen(FileName, type)) != 0)
|
||||
-#endif
|
||||
{
|
||||
/*
|
||||
The test works if MY_NFILE < 128. The problem is that fileno() is char
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
# you also find the URL of a binary repository.
|
||||
|
||||
pkgname=mingw-w64-mariadb-connector-c
|
||||
pkgver=2.2.3
|
||||
pkgrel=2
|
||||
pkgdesc="MariaDB Connector/C is used to connect applications developed in C/C++ to MariaDB and MySQL databases (mingw-w64)"
|
||||
pkgver=2.3.1
|
||||
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"
|
||||
url='https://mariadb.com/kb/en/mariadb/about-mariadb-connector-c'
|
||||
license=('LGPL')
|
||||
replaces=('mingw-w64-libmariadbclient')
|
||||
conflicts=('mingw-w64-libmariadbclient')
|
||||
|
|
@ -18,26 +18,25 @@ depends=('mingw-w64-crt' 'mingw-w64-openssl' 'mingw-w64-zlib')
|
|||
makedepends=('mingw-w64-cmake')
|
||||
options=('!strip' '!buildflags' 'staticlibs')
|
||||
source=("https://downloads.mariadb.org/interstitial/connector-c-${pkgver}/mariadb-connector-c-${pkgver}-src.tar.gz"
|
||||
'fix-libnames-mingw.patch'
|
||||
'use_fopen_for_xp_compatibility.patch'
|
||||
'fix-size-t-defined.patch')
|
||||
sha1sums=('89031eeb4cf56affea30a3d66ff2c6c29462da3d'
|
||||
'd80d94dfe46bf02cb3934ff493070f7b8cb455d9'
|
||||
'dcf3d766ae6faf99aa93d1444e3b200c4f80c4f1'
|
||||
'4d1b01a0f800b15ad6e44e387f2f8d8c147cdea3')
|
||||
'0001-Fix-libnames-for-mingw-w64.patch'
|
||||
'0002-Fix-_SIZE_T_DEFINED-under-mingw-w64.patch'
|
||||
'0003-Use-fopen-rather-than-fopen_s-for-XP-compatibility.patch')
|
||||
sha1sums=('7c12d46799e270a14ea414ea23a79aff48bf24e6'
|
||||
'1409632ae308a84fcb02bbec67b7c25851f9a0cf'
|
||||
'f0d680703b019b7aaf7ca3b9580a5e39b8482ba4'
|
||||
'dd7b5e0dc58178773c37ee846dad93e71af21554')
|
||||
|
||||
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
|
||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/mariadb-connector-c-$pkgver-src/"
|
||||
patch -p0 -i "$srcdir/fix-libnames-mingw.patch"
|
||||
patch -p0 -i "$srcdir/use_fopen_for_xp_compatibility.patch"
|
||||
patch -p0 -i "$srcdir/fix-size-t-defined.patch"
|
||||
for patch in "$srcdir/"*.patch; do
|
||||
patch -p1 -i "$patch"
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
|
||||
cd "$srcdir/mariadb-connector-c-$pkgver-src/"
|
||||
for _arch in ${_architectures}; do
|
||||
mkdir -p build-${_arch} && pushd build-${_arch}
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- include/my_global.h.orig 2015-02-02 22:18:57.873440040 -0700
|
||||
+++ include/my_global.h 2015-02-02 22:17:45.125574689 -0700
|
||||
@@ -451,7 +451,7 @@
|
||||
#define NO_PISAM /* Not needed anymore */
|
||||
#define NO_MISAM /* Not needed anymore */
|
||||
#define NO_HASH /* Not needed anymore */
|
||||
-#ifdef _WIN32
|
||||
+#if defined(_WIN32) && !defined(__MINGW32__)
|
||||
#define NO_DIR_LIBRARY /* Not standar dir-library */
|
||||
#define USE_MY_STAT_STRUCT /* For my_lib */
|
||||
#ifdef _SIZE_T_DEFINED
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
--- libmariadb/dbug.c 2014-04-04 04:21:01.000000000 -0600
|
||||
+++ libmariadb/dbug.c 2015-01-24 16:47:13.316693150 -0700
|
||||
@@ -2050,11 +2050,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
-#ifdef _WIN32
|
||||
- if (fopen_s(&fp, name, append ? "a+" : "w"))
|
||||
-#else
|
||||
if (!(fp= fopen(name, append ? "a+" : "w")))
|
||||
-#endif
|
||||
{
|
||||
(void) fprintf(stderr, ERR_OPEN, cs->process, name);
|
||||
perror("");
|
||||
--- libmariadb/my_fopen.c 2014-04-04 04:21:01.000000000 -0600
|
||||
+++ libmariadb/my_fopen.c 2015-01-24 16:46:10.735766900 -0700
|
||||
@@ -36,11 +36,7 @@
|
||||
FileName, Flags, MyFlags));
|
||||
|
||||
make_ftype(type,Flags);
|
||||
-#ifdef _WIN32
|
||||
- if (fopen_s(&fd, FileName, type) == 0)
|
||||
-#else
|
||||
if ((fd = fopen(FileName, type)) != 0)
|
||||
-#endif
|
||||
{
|
||||
/*
|
||||
The test works if MY_NFILE < 128. The problem is that fileno() is char
|
||||
Loading…
Reference in New Issue