diff options
Diffstat (limited to 'dev-db/mysql-connector-c++')
3 files changed, 139 insertions, 0 deletions
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest index 63960901c5df..247a48a0060c 100644 --- a/dev-db/mysql-connector-c++/Manifest +++ b/dev-db/mysql-connector-c++/Manifest @@ -4,12 +4,15 @@ AUX mysql-connector-c++-8.0.22-fix-build.patch 10143 BLAKE2B c1bafd2ba9ad454bc02 AUX mysql-connector-c++-8.0.24-gcc11-numeric_limits.patch 348 BLAKE2B 509e869dcfffd58d92512277ff6ea148f430cca4eb9bd9a8b929641b7f876586c012aa324bdc7b475fc61dcf38bbc4edf16ab65bbe1fc0b9b15f6d19acd25743 SHA512 be18797ab0015580e21cf480938025c38c42cdf4e6aaca4c08ecb22d44932d44778c3a51488a3620915d4933b43aa75de737e2a386d449cb0b9d25ae245d5c68 AUX mysql-connector-c++-8.0.25-fix-mysqlclient-static-binding.patch 9557 BLAKE2B eda1794a808a2bfd43a044fe05abe93d41ddf98b917e4ff22dce7d795fe62c4d53f102bbcecf5b0c2ccdcf92f49ff100f6586c1c2131ba492b0a7095f202967b SHA512 963cb123e813e8eb305210f4804b5c67bfe2ebf670c85bddfbff8d3df7b60825cecf004d2e9b45ec38abe9af9f118c88b1d121d3290cae49557208ccb309da48 AUX mysql-connector-c++-8.0.26-fix-build.patch 10080 BLAKE2B e14bf201a44c3a0fad775c3c40daf56403a35485f804c6bcac005b40e79fd798cbecc410a189b19bebafb3f6fdcc9bf9b27b5395e5f30f5e7567dc459b5a4e1c SHA512 cd0184d6d52bdd1bb8e22108708fd6489074b5d3d1510a3f38d1505bd4eebc7805327543dddaa429e635464234229e758c75c482133e198bd299e092c9301ea8 +AUX mysql-connector-c++-8.0.27-fix-build.patch 3170 BLAKE2B acadbb354505f4b40e3121134c93cabd6e13dfbbc5268ea5aadcfdd01a96fad3d682a1b2d77b0a63eeea31c7737f852d624f2505100e52016b6f98c5b2feca01 SHA512 413ca9ed5965eb9805639a8ba252d60486eb7aa038db7d2b993457e940ed61f3073d8008ee53b0e84798e9c059f84bb2c2de272412a1a256c1e6b81e43b75535 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4 DIST mysql-connector-c++-8.0.24-src.tar.gz 3797356 BLAKE2B e509e04f6c93893948c573401188567bcbda91db0e608d53b1795593abf043117e1a525d3abe5c8396068a2ef750582cde15b64412e556e89762d08032abb602 SHA512 5507bc562e8263ee17efb9d4e2f52e471da75e73a1fc4dd1bc0a2ac1c2a593be889c4b042037cf6d3cbff854ae5cc865a8800251da475aed0f31710229af26f1 DIST mysql-connector-c++-8.0.25-src.tar.gz 3800065 BLAKE2B 67546b2d7d9de25ccb440c22bd58ee83e6fae78710e6dfa802cb0446bf5be433c56458424f0ee81c9a899bbfd5f464712d2d0b43dceb4205b492c7b1a79f7858 SHA512 44dd7f4296d666801be55642e53cb5181d9b5c3b080306975a48eb6280e555d9b924b42b14b44dffee4c54fab3f662a7b6bb6584d9a1ed710f0026788611c525 DIST mysql-connector-c++-8.0.26-src.tar.gz 3980027 BLAKE2B 86ce0d94db588ed86ce7b21851f866da26268f7c9059b57697cbe1f5c5d031a3eada2f55042feb7b2888b538277c773215c0d19e8a1968ff70ce363e8f95bd77 SHA512 e3a08551a4245bf886cb7e3775a256fa379bb781b523a84d30e0d0c16cae73c808a3413b08b09998eba9c0ea3ede19e505b6392ed71712a8e9a2df31f07e4c79 +DIST mysql-connector-c++-8.0.27-src.tar.gz 4004836 BLAKE2B e581c679d8d9a31d2570b9cf1968b4e793cfccbd4cafdc5a9c9d17a465c16faa1492b2da7bdc1679d97474c27b6353274a390668f77d3cb47f72598eb3a967fa SHA512 3da7109efd2d1af813931b923218de9a85afe20d23e2654eecfa5524431f5b11ebdb8421b14563300b66ab61714e284cc15407a3b28a87922c9a8c79b2804bf3 EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1576 BLAKE2B e1835aadf499196ba42dcff6a1671bc32a4224133d68630bea249fb22ef35db6275f448bb1c891e0dcd9934fd66b3a7ebbe9935573f7f85a1d00e2613bab98fb SHA512 983abc70a156b0b0c39bd693c6ac62a149897f3b5bfddd54bc52463a5fa84397692134a16045d640db3d4797d3264803c0563a282495c21f54d4b48390223d39 EBUILD mysql-connector-c++-8.0.24.ebuild 1028 BLAKE2B 288d17c80f54d3b6c4adea98bf348a1d55bd5e3d26f82264c140304679ea658c2dcfe9354c382e925c00546373155bdc0b20134254efc6b5d1df8b1f22f4b5bf SHA512 6a26377b9d577584010c47642f4852333bbbf1311446423c0f28b521d5c8ec4380d81d257237d66b8f16cfcb01c9d654a486312c0e3c36fd71aa67facb33fd52 EBUILD mysql-connector-c++-8.0.25.ebuild 1093 BLAKE2B 050385919d4526016450efc45cadfc6ae7c6361a1585479f68d20a711b7053b12603153d42e3f1a073ef421c267e934e7e1ee920b00063fbbaf9aeffa16a9fe0 SHA512 1da205f366f7c6acc3a5bb9840829d8565426c224939750bc0bb096bf059d223eceb2c8a3044b24610dff776d1b89b1c46f0504288c090b39ac2a06ddd86bd13 EBUILD mysql-connector-c++-8.0.26.ebuild 976 BLAKE2B da877a73f3760d1f717b51b2a41aa3b8cdbd39e416301d6022f983f7db15903d0efaa3bbd7f2341ab347805575030bf3b410679bdca506f37ae21dd816336e75 SHA512 9f6c7ea47bb51b139ebf7b53b7dbe0154d7d3583ebaa98d79202df8bcc37bfa83c098a5c53208f0345520f388c565f89d6eb5044794c24621145f562a8bb263a +EBUILD mysql-connector-c++-8.0.27.ebuild 977 BLAKE2B ade3e8b80acafd9569ffa410736e984d26fc08b643e340b767c996d1061be911654d8ad00ae5b644d979a921326292b1d3a6c7bf1d7b9c2556a1afca8499e574 SHA512 696bf1a42a3c50b4b62a8a29e5307d0fc5b97f70d1098cc6fe58707dc58b782a2a5e0ae0c9c71e1de61d202d9c05a039f9ed85a72398bd3b7a296ee446c958e1 MISC metadata.xml 379 BLAKE2B c33f69c8b5aa23c867d8312fc2fffec9d22a2fa3f8f1d93f235282fb4f68869599ad8a49e46290679eea3faf1536fe13224af9dcc5eec625374bc7e28ab591fa SHA512 26cc6101cc8240e26c3491dfafc1c7ddda626e7de3ccfc235c02e92f0226c9e11109dcaeddfa934dc02dbdf99215e5899cac606f50a647d90937770e88670d67 diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-fix-build.patch new file mode 100644 index 000000000000..aadf006d25e6 --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-fix-build.patch @@ -0,0 +1,92 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e734714..b79ff3a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -474,7 +474,7 @@ set_target_properties(connector PROPERTIES + + + install(TARGETS connector +- CONFIGURATIONS Release RelWithDebInfo ++ CONFIGURATIONS Release RelWithDebInfo Gentoo + ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev + RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll +diff --git a/cdk/cmake/DepFindProtobuf.cmake b/cdk/cmake/DepFindProtobuf.cmake +index 414716c..165af4b 100644 +--- a/cdk/cmake/DepFindProtobuf.cmake ++++ b/cdk/cmake/DepFindProtobuf.cmake +@@ -52,21 +52,7 @@ if(TARGET ext::protobuf) + return() + endif() + +-message(STATUS "Setting up Protobuf.") +- +-# Setup extrnal project that builds protobuf from bundled sources +- +-add_ext(protobuf) +- +-# import targets from the external project +-# Note: The pb_ targets are created by protobuf/exports.cmake +- +-add_ext_targets(protobuf +- pb-lite pb_libprotobuf-lite +- pb-full pb_libprotobuf +- protoc pb_protoc +-) +- ++find_package(Protobuf REQUIRED) + + # Standard PROTOBUF_GENERATE_CPP modified to our usage + +@@ -95,7 +81,7 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS) + "${CMAKE_CURRENT_BINARY_DIR}/protobuf/${FIL_WE}.pb.h" + COMMAND ${CMAKE_COMMAND} + -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/protobuf" +- COMMAND ext::protoc ++ COMMAND ${Protobuf_PROTOC_EXECUTABLE} + ARGS --cpp_out "${CMAKE_CURRENT_BINARY_DIR}/protobuf" + -I ${ABS_PATH} ${ABS_FIL} + #--proto_path=${PROTOBUF_INCLUDE_DIR} +diff --git a/cdk/core/CMakeLists.txt b/cdk/core/CMakeLists.txt +index 10cae33..3907c9b 100644 +--- a/cdk/core/CMakeLists.txt ++++ b/cdk/core/CMakeLists.txt +@@ -45,7 +45,7 @@ add_library(cdk STATIC ${cdk_sources} ${HEADERS}) + + target_link_libraries(cdk + PUBLIC cdk_mysqlx cdk_parser +- PRIVATE ext::pb-lite # required by codecc.cc ++ PRIVATE protobuf # required by codecc.cc + ) + + add_coverage(cdk) +diff --git a/cdk/protocol/mysqlx/CMakeLists.txt b/cdk/protocol/mysqlx/CMakeLists.txt +index a399401..b04ffa3 100644 +--- a/cdk/protocol/mysqlx/CMakeLists.txt ++++ b/cdk/protocol/mysqlx/CMakeLists.txt +@@ -129,11 +129,7 @@ target_include_directories(cdk_proto_mysqlx PRIVATE + ${CMAKE_CURRENT_BINARY_DIR} + ) + +-if(use_full_protobuf) +- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::pb-full) +-else() +- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::pb-lite) +-endif() ++target_link_libraries(cdk_proto_mysqlx PRIVATE protobuf) + + target_link_libraries(cdk_proto_mysqlx + PRIVATE cdk_foundation ext::zlib ext::lz4 ext::zstd +diff --git a/jdbc/CMakeLists.txt b/jdbc/CMakeLists.txt +index f4355ed..f24510b 100644 +--- a/jdbc/CMakeLists.txt ++++ b/jdbc/CMakeLists.txt +@@ -299,7 +299,7 @@ endif() + + + install(TARGETS connector-jdbc +- CONFIGURATIONS Release RelWithDebInfo ++ CONFIGURATIONS Release RelWithDebInfo Gentoo + ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT JDBCDev + RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27.ebuild new file mode 100644 index 000000000000..e28d4154761c --- /dev/null +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +CMAKE_MAKEFILE_GENERATOR=emake +inherit cmake + +DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" +HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" +URI_DIR="Connector-C++" +SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz" + +LICENSE="Artistic GPL-2" +SLOT="0" +# -ppc, -sparc for bug #711940 +KEYWORDS="~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86" +IUSE="+legacy" + +RDEPEND=" + dev-libs/protobuf:= + legacy? ( + dev-libs/boost:= + >=dev-db/mysql-connector-c-8.0.27:= + ) + dev-libs/openssl:0= + " +DEPEND="${RDEPEND}" +S="${WORKDIR}/${P}-src" + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.27-fix-build.patch +) + +src_configure() { + local mycmakeargs=( + -DWITH_SSL=system + -DWITH_JDBC=$(usex legacy ON OFF) + $(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '') + $(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '') + ) + + cmake_src_configure +} |