diff options
Diffstat (limited to 'dev-db/myodbc/files')
-rw-r--r-- | dev-db/myodbc/files/5.3-cmake-doc-path.patch | 43 | ||||
-rw-r--r-- | dev-db/myodbc/files/5.3.10-cxxlinkage.patch | 29 | ||||
-rw-r--r-- | dev-db/myodbc/files/5.3.10-mariadb.patch | 58 | ||||
-rw-r--r-- | dev-db/myodbc/files/8.0.16-cxxlinkage.patch | 63 | ||||
-rw-r--r-- | dev-db/myodbc/files/cmake-doc-path.patch | 43 |
5 files changed, 0 insertions, 236 deletions
diff --git a/dev-db/myodbc/files/5.3-cmake-doc-path.patch b/dev-db/myodbc/files/5.3-cmake-doc-path.patch deleted file mode 100644 index 54f35d41d96a..000000000000 --- a/dev-db/myodbc/files/5.3-cmake-doc-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -=== modified file 'CMakeLists.txt' ---- a/CMakeLists.txt 2013-03-09 09:51:06 +0000 -+++ b/CMakeLists.txt 2013-03-09 11:05:27 +0000 -@@ -33,6 +33,12 @@ - - INCLUDE(version.cmake) - -+IF(WITH_DOCUMENTATION_INSTALL_PATH) -+ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH}) -+ELSE(WITH_DOCUMENTATION_INSTALL_PATH) -+ set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR}) -+ENDIF(WITH_DOCUMENTATION_INSTALL_PATH) -+ - #Default is to build both drivers - IF(UNICODE OR NOT ANSI) - MESSAGE(STATUS "Configuring to build Unicode driver") -@@ -329,19 +335,17 @@ - - ELSE(WIN32) - -- INSTALL(FILES ChangeLog DESTINATION .) -- INSTALL(FILES README DESTINATION .) -- INSTALL(FILES README.debug DESTINATION .) -- INSTALL(FILES INSTALL DESTINATION .) -+ INSTALL(FILES ChangeLog DESTINATION ${DOCUMENTATION_INSTALL_PATH}) -+ INSTALL(FILES README DESTINATION ${DOCUMENTATION_INSTALL_PATH}) -+ INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH}) -+ INSTALL(FILES INSTALL DESTINATION ${DOCUMENTATION_INSTALL_PATH}) - IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") -- INSTALL(FILES COPYING DESTINATION .) - ELSE() -- INSTALL(FILES LICENSE.mysql DESTINATION .) - ENDIF() - - ENDIF(WIN32) - --INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .) -+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH}) - - INCLUDE(CPack) - - - diff --git a/dev-db/myodbc/files/5.3.10-cxxlinkage.patch b/dev-db/myodbc/files/5.3.10-cxxlinkage.patch deleted file mode 100644 index 796a13754f86..000000000000 --- a/dev-db/myodbc/files/5.3.10-cxxlinkage.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake ---- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500 -+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500 -@@ -747,7 +747,7 @@ - endif() - - if(NOT MYSQL_CXXFLAGS) -- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603) -+ if(MYSQL_CXX_LINKAGE) - _mysql_conf(MYSQL_CXXFLAGS "--cxxflags") - set(MYSQL_CXX_LINKAGE 1) - else() -diff -aurN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2018-02-10 21:41:13.161553751 -0500 -+++ b/CMakeLists.txt 2018-02-10 21:45:20.038398824 -0500 -@@ -379,10 +379,9 @@ - SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") - SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib") - --SET(LIB_SUBDIR "lib") --IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") -- SET(LIB_SUBDIR "lib64") --ENDIF() -+IF(NOT LIB_SUBDIR) -+ MESSAGE(ERROR "LIB_SUBDIR is not set") -+ENDIF(NOT LIB_SUBDIR) - - MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") - diff --git a/dev-db/myodbc/files/5.3.10-mariadb.patch b/dev-db/myodbc/files/5.3.10-mariadb.patch deleted file mode 100644 index c860349e4b71..000000000000 --- a/dev-db/myodbc/files/5.3.10-mariadb.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/include/sys_main.h 2018-01-19 05:36:38.000000000 -0500 -+++ b/include/sys_main.h 2018-03-01 11:40:04.554713079 -0500 -@@ -20,6 +20,8 @@ - extern "C" { - #endif - -+#include "sys/mysql/psi/psi_memory.h" -+ - #define MY_FAE 8 /* Fatal if any error */ - #define MY_WME 16 /* Write message on error */ - #define MY_ZEROFILL 32 /* my_malloc(), fill array with zero */ ---- a/driver/connect.c 2018-01-19 05:36:38.000000000 -0500 -+++ b/driver/connect.c 2018-03-01 11:39:51.458676373 -0500 -@@ -179,7 +179,7 @@ - /* Set other connection options */ - - if (ds->allow_big_results || ds->safe) --#if MYSQL_VERSION_ID >= 50709 -+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION) - mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, &max_long); - #else - /* max_allowed_packet is a magical mysql macro. */ -@@ -252,7 +252,7 @@ - ds_get_utf8attr(ds->rsakey, &ds->rsakey8)); - } - #endif --#if MYSQL_VERSION_ID >= 50710 -+#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION) - { - char tls_options[128] = { 0 }; - if (!ds->no_tls_1) -@@ -323,7 +323,7 @@ - #endif - - mysql->options.use_ssl = !ds->disable_ssl_default; --#if MYSQL_VERSION_ID >= 50703 -+#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION) - { - if (ds->ssl_enforce) - { -@@ -332,7 +332,7 @@ - } - #endif - --#if MYSQL_VERSION_ID >= 50711 -+#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION) - if (ds->sslmode) - { - unsigned int mode = 0; -@@ -510,7 +510,7 @@ - } - } - --#if MYSQL_VERSION_ID >= 50709 -+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION) - mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_len); - #else - // for older versions just use net_buffer_length() macro diff --git a/dev-db/myodbc/files/8.0.16-cxxlinkage.patch b/dev-db/myodbc/files/8.0.16-cxxlinkage.patch deleted file mode 100644 index 326036c0b88d..000000000000 --- a/dev-db/myodbc/files/8.0.16-cxxlinkage.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake ---- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500 -+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500 -@@ -747,7 +747,7 @@ - endif() - - if(NOT MYSQL_CXXFLAGS) -- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603) -+ if(MYSQL_CXX_LINKAGE) - _mysql_conf(MYSQL_CXXFLAGS "--cxxflags") - set(MYSQL_CXX_LINKAGE 1) - else() -diff -aurN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2018-02-10 21:41:13.161553751 -0500 -+++ b/CMakeLists.txt 2018-02-10 21:45:20.038398824 -0500 -@@ -379,10 +379,9 @@ - SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") - SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib") - --SET(LIB_SUBDIR "lib") --IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64|aarch64)") -- SET(LIB_SUBDIR "lib64") --ENDIF() -+IF(NOT LIB_SUBDIR) -+ MESSAGE(ERROR "LIB_SUBDIR is not set") -+ENDIF(NOT LIB_SUBDIR) - - MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") - -diff -aurN a/driver/CMakeLists.txt b/driver/CMakeLists.txt ---- a/driver/CMakeLists.txt 2019-06-11 13:46:37.863345781 -0400 -+++ b/driver/CMakeLists.txt 2019-06-11 14:04:25.758997218 -0400 -@@ -194,29 +194,3 @@ - - ENDWHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT}) - --IF(MYSQL8) -- SET(ssl_libs_to_find -- libcrypto.* -- libssl.* -- libeay32.* -- ssleay32.* -- ) -- -- SET(_SSL_PATH) -- -- IF(WIN32) -- SET(_SSL_PATH ${MYSQL_DIR}/bin/) -- ELSE(WIN32) -- SET(_SSL_PATH ${MYSQL_DIR}/lib/) -- ENDIF(WIN32) -- -- FOREACH(_lib_to_find IN LISTS ssl_libs_to_find) -- INSTALL(DIRECTORY ${_SSL_PATH} DESTINATION ${LIB_SUBDIR} -- FILES_MATCHING -- PATTERN "mecab" EXCLUDE -- PATTERN "pkgconfig" EXCLUDE -- PATTERN "plugin" EXCLUDE -- PATTERN ${_lib_to_find}) -- ENDFOREACH() -- --ENDIF(MYSQL8) -\ No newline at end of file diff --git a/dev-db/myodbc/files/cmake-doc-path.patch b/dev-db/myodbc/files/cmake-doc-path.patch deleted file mode 100644 index c7f7d9d37ce7..000000000000 --- a/dev-db/myodbc/files/cmake-doc-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -=== modified file 'CMakeLists.txt' ---- CMakeLists.txt 2013-03-09 09:51:06 +0000 -+++ CMakeLists.txt 2013-03-09 11:05:27 +0000 -@@ -33,6 +33,12 @@ - SET(CONNECTOR_MAJOR "5") - SET(CONNECTOR_MINOR "2") - -+IF(WITH_DOCUMENTATION_INSTALL_PATH) -+ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH}) -+ELSE(WITH_DOCUMENTATION_INSTALL_PATH) -+ set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR}) -+ENDIF(WITH_DOCUMENTATION_INSTALL_PATH) -+ - IF(CONNECTOR_MINOR LESS 10) - SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}") - ELSE(CONNECTOR_MINOR LESS 10) -@@ -329,19 +335,17 @@ - - ELSE(WIN32) - -- INSTALL(FILES ChangeLog DESTINATION .) -- INSTALL(FILES README DESTINATION .) -- INSTALL(FILES README.debug DESTINATION .) -- INSTALL(FILES INSTALL DESTINATION .) -+ INSTALL(FILES ChangeLog DESTINATION ${DOCUMENTATION_INSTALL_PATH}) -+ INSTALL(FILES README DESTINATION ${DOCUMENTATION_INSTALL_PATH}) -+ INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH}) -+ INSTALL(FILES INSTALL DESTINATION ${DOCUMENTATION_INSTALL_PATH}) - IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") -- INSTALL(FILES COPYING DESTINATION .) - ELSE() -- INSTALL(FILES LICENSE.mysql DESTINATION .) - ENDIF() - - ENDIF(WIN32) - --INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .) -+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH}) - - INCLUDE(CPack) - - - |