From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../mysql-connector-c++-1.1.0-disable-tests.patch | 14 +++ .../mysql-connector-c++-1.1.0-fix-cmake.patch | 85 ++++++++++++++ .../mysql-connector-c++-1.1.3-fix-cmake.patch | 123 +++++++++++++++++++++ .../mysql-connector-c++-1.1.5-fix-cmake.patch | 106 ++++++++++++++++++ .../mysql-connector-c++-1.1.5-fix-mariadb.patch | 45 ++++++++ .../mysql-connector-c++-1.1.6-fix-cmake.patch | 23 ++++ 6 files changed, 396 insertions(+) create mode 100644 dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch create mode 100644 dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch create mode 100644 dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch create mode 100644 dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch create mode 100644 dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch create mode 100644 dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch (limited to 'dev-db/mysql-connector-c++/files') diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch new file mode 100644 index 000000000000..e6345c046b63 --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch @@ -0,0 +1,14 @@ +diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt mysql-connector-c++-1.0.6~r754/CMakeLists.txt +--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt 2009-08-20 22:25:35.000000000 +0200 ++++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt 2009-08-20 22:25:57.000000000 +0200 +@@ -241,10 +241,6 @@ + ADD_SUBDIRECTORY(cppconn) + ADD_SUBDIRECTORY(driver) + ADD_SUBDIRECTORY(examples) +-ADD_SUBDIRECTORY(test) +-ADD_SUBDIRECTORY(test/framework) +-ADD_SUBDIRECTORY(test/CJUnitTestsPort) +-ADD_SUBDIRECTORY(test/unit) + + IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") + # see also README diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch new file mode 100644 index 000000000000..d32fa07f1e0b --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch @@ -0,0 +1,85 @@ +diff -urN mysql-connector-c++-1.1.0.old/CMakeLists.txt mysql-connector-c++-1.1.0/CMakeLists.txt +--- mysql-connector-c++-1.1.0.old/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ mysql-connector-c++-1.1.0/CMakeLists.txt 2011-07-30 13:16:18.000000000 +0200 +@@ -232,7 +232,7 @@ + "install_manifest.txt") + SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_DRAFT" ) + +-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$") ++SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$") + SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" ) + SET(CPACK_SOURCE_GENERATOR "TGZ") + +diff -urN mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt +--- mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200 +@@ -55,7 +55,7 @@ + + SET(MYSQLCPPCONN_INSTALL_HEADERS + build_config.h +- config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/config.h + connection.h + datatype.h + driver.h +diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt +--- mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ mysql-connector-c++-1.1.0/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200 +@@ -26,6 +26,9 @@ + + INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) + INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi) + INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}) + MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}") + +@@ -149,20 +152,22 @@ + nativeapi/native_statement_wrapper.h + nativeapi/mysql_native_resultset_wrapper.h + nativeapi/native_resultset_wrapper.h +- ../cppconn/warning.h +- ../cppconn/statement.h +- ../cppconn/sqlstring.h +- ../cppconn/resultset_metadata.h +- ../cppconn/resultset.h +- ../cppconn/prepared_statement.h +- ../cppconn/parameter_metadata.h +- ../cppconn/metadata.h +- ../cppconn/exception.h +- ../cppconn/driver.h +- ../cppconn/datatype.h +- ../cppconn/connection.h +- ../cppconn/config.h +- ../cppconn/build_config.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h + + ) + +@@ -271,8 +276,8 @@ + ) + ELSE(WIN32) + INSTALL(TARGETS mysqlcppconn mysqlcppconn-static +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} + ) + ENDIF(WIN32) + diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch new file mode 100644 index 000000000000..5f0669ca3381 --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch @@ -0,0 +1,123 @@ +--- a/CMakeLists.txt 2014-05-04 21:27:59.000000000 -0400 ++++ b/CMakeLists.txt 2014-05-04 21:47:31.460572470 -0400 +@@ -38,7 +38,7 @@ + + if(COMMAND cmake_policy AND POLICY CMP0015) + cmake_policy(SET CMP0015 NEW) +-endif(COMMAND cmake_policy) ++endif(COMMAND cmake_policy AND POLICY CMP0015) + + #----------------- + # CPPFLAGS, CXXFLAGS and LDFLAGS from the environment +@@ -258,14 +258,14 @@ + ${CPACK_RESOURCE_FILE_LICENSE} + "${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt" + "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" +- DESTINATION "." OPTIONAL) ++ DESTINATION "${INSTALL_DOCS}" OPTIONAL) + + SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/" + ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile" + "install_manifest.txt") + SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" ) + +-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$") ++SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$") + SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" ) + SET(CPACK_SOURCE_GENERATOR "TGZ") + +@@ -292,10 +292,6 @@ + ADD_SUBDIRECTORY(cppconn) + ADD_SUBDIRECTORY(driver) + ADD_SUBDIRECTORY(examples) +-ADD_SUBDIRECTORY(test) +-ADD_SUBDIRECTORY(test/framework) +-ADD_SUBDIRECTORY(test/CJUnitTestsPort) +-ADD_SUBDIRECTORY(test/unit) + + IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") + # see also README +--- a/FindMySQL.cm 2014-05-04 22:20:50.000000000 -0400 ++++ b/FindMySQL.cm 2014-05-04 22:21:40.325384447 -0400 +@@ -58,7 +58,7 @@ + EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags" + OUTPUT_VARIABLE _mysql_config_output + ) +- STRING(REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}") ++ STRING(REGEX MATCHALL " -m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}") + STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}") + # ADD_DEFINITIONS("${MYSQL_CXXFLAGS}") + ELSE (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32) +diff -urN a/cppconn/CMakeLists.txt b/cppconn/CMakeLists.txt +--- a/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ b/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200 +@@ -55,7 +55,7 @@ + + SET(MYSQLCPPCONN_INSTALL_HEADERS + build_config.h +- config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/config.h + connection.h + datatype.h + driver.h +diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt +--- a/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ b/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200 +@@ -26,6 +26,9 @@ + + INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) + INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi) + INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}) + MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}") + +@@ -149,20 +152,22 @@ + nativeapi/native_statement_wrapper.h + nativeapi/mysql_native_resultset_wrapper.h + nativeapi/native_resultset_wrapper.h +- ../cppconn/warning.h +- ../cppconn/statement.h +- ../cppconn/sqlstring.h +- ../cppconn/resultset_metadata.h +- ../cppconn/resultset.h +- ../cppconn/prepared_statement.h +- ../cppconn/parameter_metadata.h +- ../cppconn/metadata.h +- ../cppconn/exception.h +- ../cppconn/driver.h +- ../cppconn/datatype.h +- ../cppconn/connection.h +- ../cppconn/config.h +- ../cppconn/build_config.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h + + ) + +@@ -271,8 +276,8 @@ + ) + ELSE(WIN32) + INSTALL(TARGETS mysqlcppconn mysqlcppconn-static +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} + ) + ENDIF(WIN32) + diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch new file mode 100644 index 000000000000..33479092561f --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch @@ -0,0 +1,106 @@ +--- a/CMakeLists.txt 2014-05-04 21:27:59.000000000 -0400 ++++ b/CMakeLists.txt 2014-05-04 21:47:31.460572470 -0400 +@@ -269,14 +269,14 @@ + ${CPACK_RESOURCE_FILE_LICENSE} + "${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt" + "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" +- DESTINATION "." OPTIONAL) ++ DESTINATION "${INSTALL_DOCS}" OPTIONAL) + + SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/" + "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile" + "install_manifest.txt") + SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" ) + +-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$" "./driver/version_info.h$") ++SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/version_info.h$") + SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" ) + SET(CPACK_SOURCE_GENERATOR "TGZ") + +@@ -303,10 +303,6 @@ + ADD_SUBDIRECTORY(cppconn) + ADD_SUBDIRECTORY(driver) + ADD_SUBDIRECTORY(examples) +-ADD_SUBDIRECTORY(test) +-ADD_SUBDIRECTORY(test/framework) +-ADD_SUBDIRECTORY(test/CJUnitTestsPort) +-ADD_SUBDIRECTORY(test/unit) + + IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") + # see also README +diff -urN a/cppconn/CMakeLists.txt b/cppconn/CMakeLists.txt +--- a/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ b/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200 +@@ -55,7 +55,7 @@ + + SET(MYSQLCPPCONN_INSTALL_HEADERS + build_config.h +- config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/config.h + connection.h + datatype.h + driver.h +diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt +--- a/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ b/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200 +@@ -26,6 +26,9 @@ + + INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}) + INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn) ++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi) + INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}) + MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}") + +@@ -149,21 +152,23 @@ + nativeapi/native_statement_wrapper.h + nativeapi/mysql_native_resultset_wrapper.h + nativeapi/native_resultset_wrapper.h +- ../cppconn/warning.h +- ../cppconn/statement.h +- ../cppconn/sqlstring.h +- ../cppconn/resultset_metadata.h +- ../cppconn/resultset.h +- ../cppconn/prepared_statement.h +- ../cppconn/parameter_metadata.h +- ../cppconn/metadata.h +- ../cppconn/exception.h +- ../cppconn/driver.h +- ../cppconn/datatype.h +- ../cppconn/variant.h +- ../cppconn/connection.h +- ../cppconn/config.h +- ../cppconn/build_config.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/variant.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h ++ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h + + ) + +diff -aruN a/FindMySQL.cmake b/FindMySQL.cmake +--- a/FindMySQL.cmake 2014-11-19 08:37:11.000000000 -0500 ++++ b/FindMySQL.cmake 2015-02-21 21:58:20.264446822 -0500 +@@ -462,7 +462,7 @@ + endif() + + if(NOT MYSQL_CXXFLAGS) +- if(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) ++ if(MYSQL_CXX_LINKAGE) + _mysql_conf(MYSQL_CXXFLAGS "--cxxflags") + set(MYSQL_CXX_LINKAGE 1) + else() diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch new file mode 100644 index 000000000000..fa36e3bad936 --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch @@ -0,0 +1,45 @@ +diff -aruN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp +--- a/driver/nativeapi/libmysql_static_proxy.cpp 2014-11-19 08:37:11.000000000 -0500 ++++ b/driver/nativeapi/libmysql_static_proxy.cpp 2015-02-21 22:19:50.119234140 -0500 +@@ -319,7 +319,7 @@ + int + LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg) + { +-#if MYSQL_VERSION_ID >= 50703 ++#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) + if (::mysql_get_option(mysql, option, arg)) { + throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); + } else { +diff -aruN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp +--- a/driver/mysql_connection.cpp 2014-11-19 08:37:11.000000000 -0500 ++++ b/driver/mysql_connection.cpp 2015-02-21 22:28:48.920210376 -0500 +@@ -1015,6 +1015,7 @@ + MY_CHARSET_INFO cs; + proxy->get_character_set_info(&cs); + *(static_cast(optionValue)) = cs.mbmaxlen; ++#ifndef MARIADB_BASE_VERSION + /* mysql_get_option() was added in mysql 5.7.3 version */ + } else if ( proxy->get_server_version() >= 50703 ) { + try { +@@ -1029,6 +1030,7 @@ + CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str()); + throw e; + } ++#endif /* MARIADB_BASE_VERSION */ + } + } + /* }}} */ +@@ -1046,11 +1048,13 @@ + MY_CHARSET_INFO cs; + proxy->get_character_set_info(&cs); + return cs.dir ? sql::SQLString(cs.dir) : ""; ++#ifndef MARIADB_BASE_VERSION + } else if ( proxy->get_server_version() >= 50703 ) { + const char* optionValue= NULL; + if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) { + return optionValue ? sql::SQLString(optionValue) : ""; + } ++#endif /* MARIADB_BASE_VERSION */ + } + return ""; + } diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch new file mode 100644 index 000000000000..18d4e9a80410 --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch @@ -0,0 +1,23 @@ +diff -aurN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2015-06-04 08:58:30.000000000 -0400 ++++ b/CMakeLists.txt 2015-07-21 10:41:59.081091000 -0400 +@@ -300,7 +300,7 @@ + SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}") + ENDIF(WIN32) + +-SET(DOC_DESTINATION ".") ++SET(DOC_DESTINATION ${INSTALL_DOCS}) + IF(RPM_LAYOUT) + SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}") + ENDIF() +@@ -373,10 +373,6 @@ + ADD_SUBDIRECTORY(cppconn) + ADD_SUBDIRECTORY(driver) + ADD_SUBDIRECTORY(examples) +-ADD_SUBDIRECTORY(test) +-ADD_SUBDIRECTORY(test/framework) +-ADD_SUBDIRECTORY(test/CJUnitTestsPort) +-ADD_SUBDIRECTORY(test/unit) + + IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") + # see also README -- cgit v1.2.3-65-gdbad