File mingw-w64.diff of Package mingw32-mysql-connector-c

Overview Repositories Revisions Requests Users Attributes Meta

File mingw-w64.diff of Package mingw32-mysql-connector-c (Revision 0f5753df3508900e08ad964dd2e9d87b)

Currently displaying revision 0f5753df3508900e08ad964dd2e9d87b , Show latest

From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-05-09 01:10:24.857961950 +0200
Note: authoritative copy in build.opensuse.org:/windows/mingw/win32/mingw32-mysql-connector-c

MINGW is a platform that is both UNIX and WIN32. The Makefiles do not
distinguish this enough. Introduce the MINGW and POSIX_BUILD cmake
variables to control better which snippets are run.

A mingw-targeting compiler that is running on a POSIXish platform
(Cygwin, Linux) obeys case sensitivity. Fixup some filenames so it
can succeed.

Also fix one C++ error; inline class members shall not repeat the
class name qualifier again.

mingw-w64 does have a declaration for gmtime_s, but no library
contains it yet.

Index: mysql-connector-c-6.1.3-src/cmake/info_macros.cmake.in
===================================================================
--- mysql-connector-c-6.1.3-src.orig/cmake/info_macros.cmake.in
+++ mysql-connector-c-6.1.3-src/cmake/info_macros.cmake.in
@@ -91,7 +91,7 @@ MACRO(CREATE_INFO_BIN)
   IF (WIN32)
     EXECUTE_PROCESS(COMMAND cmd /c date /T
         OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-  ELSEIF(UNIX)
+  ELSEIF(UNIX OR POSIX_BUILD)
     EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S"
         OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
   ELSE()
Index: mysql-connector-c-6.1.3-src/cmake/install_macros.cmake
===================================================================
--- mysql-connector-c-6.1.3-src.orig/cmake/install_macros.cmake
+++ mysql-connector-c-6.1.3-src/cmake/install_macros.cmake
@@ -114,7 +114,7 @@ ENDFUNCTION()
 # We do 'cd path; ln -s target_name link_name'
 # We also add an INSTALL target for "${path}/${link_name}"
 MACRO(INSTALL_SYMLINK target target_name link_name destination component)
-IF(UNIX)
+IF(UNIX OR POSIX_BUILD)
   GET_TARGET_PROPERTY(location ${target} LOCATION)
   GET_FILENAME_COMPONENT(path ${location} PATH)
 
@@ -221,7 +221,7 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
       SIGN_TARGET(${target})
     ENDIF()
     # Install man pages on Unix
-    IF(UNIX)
+    IF(UNIX OR POSIX_BUILD)
       GET_TARGET_PROPERTY(target_location ${target} LOCATION)
       INSTALL_MANPAGE(${target_location})
     ENDIF()
Index: mysql-connector-c-6.1.3-src/cmake/libutils.cmake
===================================================================
--- mysql-connector-c-6.1.3-src.orig/cmake/libutils.cmake
+++ mysql-connector-c-6.1.3-src/cmake/libutils.cmake
@@ -65,7 +65,7 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_
 # that references all exports and this prevents linker from creating an 
 # empty library(there are unportable alternatives, --whole-archive)
 MACRO(CREATE_EXPORT_FILE VAR TARGET API_FUNCTIONS)
-  IF(WIN32)
+  IF(WIN32 AND NOT MINGW)
     SET(DUMMY ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_dummy.c)
     SET(EXPORTS ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_exports.def)
     CONFIGURE_FILE_CONTENT("" ${DUMMY})
@@ -290,7 +290,7 @@ ENDFUNCTION()
 # We try to hide the symbols in yassl/zlib to avoid name clashes with
 # other libraries like openssl.
 FUNCTION(RESTRICT_SYMBOL_EXPORTS target)
-  IF(CMAKE_COMPILER_IS_GNUCXX AND UNIX)
+  IF(CMAKE_COMPILER_IS_GNUCXX AND (UNIX OR MINGW))
     SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
     CHECK_C_COMPILER_FLAG("-fvisibility=hidden" HAVE_VISIBILITY_HIDDEN)
     IF(HAVE_VISIBILITY_HIDDEN)
Index: mysql-connector-c-6.1.3-src/cmake/mysql_version.cmake
===================================================================
--- mysql-connector-c-6.1.3-src.orig/cmake/mysql_version.cmake
+++ mysql-connector-c-6.1.3-src/cmake/mysql_version.cmake
@@ -140,7 +140,7 @@ SET(COMPANYNAME ${CPACK_PACKAGE_VENDOR})
 #IF (WIN32)
 #  EXECUTE_PROCESS(COMMAND "date" "/T" OUTPUT_VARIABLE TMP_DATE)
 #  STRING(REGEX REPLACE "(..)/(..)/..(..).*" "\\3\\2\\1" MYSQL_COPYRIGHT_YEAR ${TMP_DATE})
-IF(UNIX)
+IF(UNIX OR POSIX_BUILD)
   EXECUTE_PROCESS(COMMAND "date" "+%Y" OUTPUT_VARIABLE MYSQL_COPYRIGHT_YEAR OUTPUT_STRIP_TRAILING_WHITESPACE)
 ENDIF()
 
Index: mysql-connector-c-6.1.3-src/cmake/os/Windows.cmake
===================================================================
--- mysql-connector-c-6.1.3-src.orig/cmake/os/Windows.cmake
+++ mysql-connector-c-6.1.3-src/cmake/os/Windows.cmake
@@ -62,7 +62,7 @@ ADD_DEFINITIONS("-DWIN32_LEAN_AND_MEAN")
   
 # Should be available on Windows Server 2003 and above.
 CHECK_CXX_SOURCE_COMPILES(
-"#include <Windows.h>
+"#include <windows.h>
 int main() {
   GetCurrentProcessorNumber();
   return 0;
Index: mysql-connector-c-6.1.3-src/extra/yassl/src/yassl_int.cpp
===================================================================
--- mysql-connector-c-6.1.3-src.orig/extra/yassl/src/yassl_int.cpp
+++ mysql-connector-c-6.1.3-src/extra/yassl/src/yassl_int.cpp
@@ -20,7 +20,7 @@
 // First include (the generated) my_config.h, to get correct platform defines.
 #include "my_config.h"
 #ifdef _WIN32
-#include<Windows.h>
+#include <windows.h>
 #else
 #include <pthread.h>
 #endif
Index: mysql-connector-c-6.1.3-src/include/mysql/psi/mysql_socket.h
===================================================================
--- mysql-connector-c-6.1.3-src.orig/include/mysql/psi/mysql_socket.h
+++ mysql-connector-c-6.1.3-src/include/mysql/psi/mysql_socket.h
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth
 #ifdef _WIN32
   #include <ws2def.h>
   #include <winsock2.h>
-  #include <MSWSock.h>
+  #include <mswsock.h>
   #define SOCKBUF_T char
 #else
   #include <netinet/in.h>
Index: mysql-connector-c-6.1.3-src/libmysql/CMakeLists.txt
===================================================================
--- mysql-connector-c-6.1.3-src.orig/libmysql/CMakeLists.txt
+++ mysql-connector-c-6.1.3-src/libmysql/CMakeLists.txt
@@ -225,13 +225,20 @@ MACRO(GET_TARGET_NAME target out_name)
   SET(${out_name} ${name})
 ENDMACRO()
 
-IF(UNIX)
+IF(UNIX OR MINGW)
   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
+    IF(MINGW)
+    	SET(DOT_VERSION "-${VERSION}")
+    	IF(DOT_VERSION STREQUAL "-")
+    	  SET(DOT_VERSION "")
+    	ENDIF()
+    ELSE()
     SET(DOT_VERSION ".${VERSION}")
     IF(DOT_VERSION STREQUAL ".") 
       SET(DOT_VERSION "")
     ENDIF()
-    IF(APPLE)
+    ENDIF()
+    IF(APPLE OR MINGW)
       SET(${OUTNAME} ${LIBNAME}${DOT_VERSION}${EXTENSION})
     ELSE()
       SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
@@ -239,7 +246,7 @@ IF(UNIX)
   ENDMACRO()
 ENDIF()
 
-IF(UNIX)
+IF(UNIX OR POSIX_BUILD)
   GET_TARGET_NAME(mysqlclient lib_name)
   INSTALL_SYMLINK(mysqlclient
     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
@@ -252,9 +259,9 @@ IF(NOT DISABLE_SHARED)
   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
     EXPORTS ${CLIENT_API_FUNCTIONS}
     COMPONENT SharedLibraries)
-  IF(UNIX)
+  IF(UNIX OR MINGW)
     # libtool compatability
-    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
+    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE OR MINGW)
       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
     ELSE()
       SET(OS_SHARED_LIB_VERSION
@@ -265,6 +272,12 @@ IF(NOT DISABLE_SHARED)
       OUTPUT_NAME mysqlclient 
       VERSION "${OS_SHARED_LIB_VERSION}" 
       SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
+    IF(MINGW)
+    	# cmake is too dumb to handle mingw. Do the basics (append -MAJOR)
+    	# and then do the rest in .spec
+    	SET_TARGET_PROPERTIES(libmysql PROPERTIES
+    		OUTPUT_NAME "mysqlclient-${OS_SHARED_LIB_VERSION}")
+    ENDIF()
     CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver)
 
     GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
@@ -289,6 +302,9 @@ IF(NOT DISABLE_SHARED)
     SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
     SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
+IF(NOT MINGW)
+# do in .spec instead;
+
     # Install links to libmysqlclient.so (client_r)
     GET_VERSIONED_LIBNAME(
       "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
@@ -315,6 +331,7 @@ IF(NOT DISABLE_SHARED)
         ${lib_name_ver} ${linkname}
         ${INSTALL_LIBDIR} SharedLibraries)
     ENDFOREACH()
+ENDIF()
   ENDIF()
 ENDIF()
 
Index: mysql-connector-c-6.1.3-src/libmysql/authentication_win/CMakeLists.txt
===================================================================
--- mysql-connector-c-6.1.3-src.orig/libmysql/authentication_win/CMakeLists.txt
+++ mysql-connector-c-6.1.3-src/libmysql/authentication_win/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(HEADERS common.h handshake.h)
 SET(PLUGIN_SOURCES plugin_client.cc handshake_client.cc log_client.cc common.cc handshake.cc)
 
 ADD_CONVENIENCE_LIBRARY(auth_win_client ${PLUGIN_SOURCES} ${HEADERS})
-TARGET_LINK_LIBRARIES(auth_win_client Secur32)
+TARGET_LINK_LIBRARIES(auth_win_client secur32)
 
 # In IDE, group headers in a separate folder.
 
Index: mysql-connector-c-6.1.3-src/libmysql/authentication_win/handshake.h
===================================================================
--- mysql-connector-c-6.1.3-src.orig/libmysql/authentication_win/handshake.h
+++ mysql-connector-c-6.1.3-src/libmysql/authentication_win/handshake.h
@@ -100,7 +100,7 @@ public:
   Handshake(const char *ssp, side_t side);
   virtual ~Handshake();
 
-  int Handshake::packet_processing_loop();
+  int packet_processing_loop();
 
   bool virtual is_complete() const
   {
Index: mysql-connector-c-6.1.3-src/libmysql/authentication_win/plugin_client.cc
===================================================================
--- mysql-connector-c-6.1.3-src.orig/libmysql/authentication_win/plugin_client.cc
+++ mysql-connector-c-6.1.3-src/libmysql/authentication_win/plugin_client.cc
@@ -26,7 +26,7 @@
 */
 
 #ifdef _MSC_VER
-#pragma comment(lib, "Secur32")
+#pragma comment(lib, "secur32")
 #endif
 
 static int win_auth_client_plugin_init(char*, size_t, int, va_list)
Index: mysql-connector-c-6.1.3-src/mysys/my_wincond.c
===================================================================
--- mysql-connector-c-6.1.3-src.orig/mysys/my_wincond.c
+++ mysql-connector-c-6.1.3-src/mysys/my_wincond.c
@@ -152,14 +152,24 @@ int pthread_dummy(int ret)
 
 struct tm *localtime_r(const time_t *timep,struct tm *tmp)
 {
-  localtime_s(tmp, timep);
+  /*
+   * MSDN documentation says localtime, gmtime and all those old functions
+   * are MT-safe by using thread-local storage internally.
+   */
+  struct tm *x = localtime(timep);
+  if (x == NULL)
+  	return NULL;
+  memcpy(tmp, x, sizeof(*x));
   return tmp;
 }
 
 
 struct tm *gmtime_r(const time_t *clock, struct tm *res)
 {
-  gmtime_s(res, clock);
+  struct tm *x = gmtime(clock);
+  if (x == NULL)
+  	return NULL;
+  memcpy(res, x, sizeof(*x));
   return res;
 }
 #endif /* _WIN32 */

Places

File mingw-w64.diff of Package mingw32-mysql-connector-c (Revision 0f5753df3508900e08ad964dd2e9d87b)

Places