diff options
| author | Alfred Wingate <parona@protonmail.com> | 2025-03-09 02:59:29 +0200 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-03-10 00:21:36 +0000 |
| commit | b3e4cd1362c31f19f49de4397448682245179585 (patch) | |
| tree | 9693cbae60043188be3e7e6eec82f39d59789e17 /dev-db/mysql-connector-c++/files | |
| parent | 4b6338b1658868b774411ac11f2bb23e5a3240c8 (diff) | |
| download | gentoo-b3e4cd1362c31f19f49de4397448682245179585.tar.gz gentoo-b3e4cd1362c31f19f49de4397448682245179585.tar.bz2 gentoo-b3e4cd1362c31f19f49de4397448682245179585.zip | |
dev-db/mysql-connector-c++: add 9.2.0
* Add tests.
Bug: https://bugs.gentoo.org/863188
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-db/mysql-connector-c++/files')
3 files changed, 95 insertions, 0 deletions
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-9.2.0-gcc-15-cstdint.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-9.2.0-gcc-15-cstdint.patch new file mode 100644 index 000000000000..8e4bd1811f75 --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-9.2.0-gcc-15-cstdint.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/863188 + +diff --git a/include/mysqlx/common/value.h b/include/mysqlx/common/value.h +index 4f1b7a38..c30bbd0a 100644 +--- a/include/mysqlx/common/value.h ++++ b/include/mysqlx/common/value.h +@@ -39,7 +39,7 @@ + PUSH_SYS_WARNINGS + #include <string> + POP_SYS_WARNINGS +- ++#include <cstdint> + + namespace mysqlx { + MYSQLX_ABI_BEGIN(2,0) + diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-9.2.0-hookup-tests.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-9.2.0-hookup-tests.patch new file mode 100644 index 000000000000..ba3cb5aaf7c8 --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-9.2.0-hookup-tests.patch @@ -0,0 +1,64 @@ +From 8d344b6c4ebb1f0029aecaee9cb0b5522e7db27e Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Sat, 8 Mar 2025 00:05:15 +0200 +Subject: [PATCH] Build correctly against shared library gtest + +Not upstreamable as is. +--- a/cdk/cmake/gtest.cmake ++++ b/cdk/cmake/gtest.cmake +@@ -132,19 +132,8 @@ MESSAGE("gtest location: ${gtest_location}") + MESSAGE("gtest_main location: ${gtest_main_location}") + + +-add_library(gtest STATIC IMPORTED) +-add_library(gtest_main STATIC IMPORTED) +- +-set_target_properties(gtest PROPERTIES +- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" +- IMPORTED_LOCATION "${gtest_location}" +-) +- +-set_target_properties(gtest_main PROPERTIES +- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" +- IMPORTED_LINK_INTERFACE_LIBRARIES "gtest" +- IMPORTED_LOCATION "${gtest_main_location}" +-) ++add_library(gtest ALIAS GTest::gtest) ++add_library(gtest_main ALIAS GTest::gtest_main) + + # + # Setup configuration-specific locations for Win +@@ -193,11 +182,5 @@ IF(WIN32) + + ENDFOREACH(Config) + +-ELSE(WIN32) +- +- # On unix gtest depends on pthread library +- set_property(TARGET gtest APPEND PROPERTY INTERFACE_LINK_LIBRARIES pthread) +- set_property(TARGET gtest APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES pthread) +- + ENDIF(WIN32) + +-- +2.48.1 + +From 1d0f1fbb800517583029b6bc88d285bcb1245111 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Sat, 8 Mar 2025 00:06:41 +0200 +Subject: [PATCH] Hook cdk unittests to ctest + +--- a/cdk/cmake/testing.cmake ++++ b/cdk/cmake/testing.cmake +@@ -370,6 +370,8 @@ IF(WITH_TESTS) + COMMENT "# Generating test group definitons." + ) + ++ gtest_discover_tests(${target_run_unit_tests}) ++ + ENDIF() + ENDMACRO(ADD_TEST_TARGET) + +-- +2.48.1 + diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-9.2.0-test-iomanip.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-9.2.0-test-iomanip.patch new file mode 100644 index 000000000000..ae9b58f519ea --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-9.2.0-test-iomanip.patch @@ -0,0 +1,15 @@ +Implicit requirement due to use of std::setw + +diff --git a/devapi/tests/session-t.cc b/devapi/tests/session-t.cc +index 758a0b8f..138cdcac 100644 +--- a/devapi/tests/session-t.cc ++++ b/devapi/tests/session-t.cc +@@ -35,6 +35,7 @@ + #include <thread> + #include <map> + #include <sstream> ++#include <iomanip> + + using std::cout; + using std::endl; + |