1 |
commit: 5a6c074f7712a67b6b1ee31cbf853ac379d864f1 |
2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
3 |
AuthorDate: Tue Jul 5 21:09:44 2022 +0000 |
4 |
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
5 |
CommitDate: Tue Jul 5 21:19:04 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=5a6c074f |
7 |
|
8 |
dev-db/mysql-connector-c++: Add 8.0.27 |
9 |
|
10 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
11 |
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> |
12 |
|
13 |
dev-db/mysql-connector-c++/Manifest | 1 + |
14 |
.../mysql-connector-c++-8.0.27-fix-build.patch | 92 ++++++++++++++++++++++ |
15 |
dev-db/mysql-connector-c++/metadata.xml | 3 +- |
16 |
.../mysql-connector-c++-8.0.27.ebuild | 45 +++++++++++ |
17 |
4 files changed, 140 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest |
20 |
index d77ba66..72931be 100644 |
21 |
--- a/dev-db/mysql-connector-c++/Manifest |
22 |
+++ b/dev-db/mysql-connector-c++/Manifest |
23 |
@@ -2,3 +2,4 @@ DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 82a2900b0daa00bcfd72d |
24 |
DIST mysql-connector-c++-8.0.20-src.tar.gz 3774428 BLAKE2B a06114432ab21c36fd0b3b91df2382198b2a48871e8e0bfd8c7a94729ed0e29f33599c078c97670fe9d744b13042db52fb89de2294c75eae670a77112d11d251 SHA512 3edb7c3d4ccf218a3f76afcf83a6d233b7accd236c05105ab3f7a6610cfd8809a78c78142c82fb60fb0931d2ae0f0f8fdc3ce9caf5f0cde7ef54067a7e20270b |
25 |
DIST mysql-connector-c++-8.0.21-src.tar.gz 3788740 BLAKE2B 1862b4f2c6e2a2bbe8e3044eea2c1d3c8fdb0a319e3758ca44686b79e917a65617e2cfd0e4b698d858ed9ef12c892b4f658eb287f2a8505a5daeeb79d9544c25 SHA512 8a64dff2efd16d2891f613fd416ec42ecba2490b428b1778e99822a3051d9c5af3b94006577e9f38a6ebd146d2f3be522cb876f1e42fbf0ac82001b0a62ffa62 |
26 |
DIST mysql-connector-c++-8.0.22-src.tar.gz 3795112 BLAKE2B c5d6f0ebeb4649857f3217a35f3ae885d62be63af4da09815e7eb156538ece4f805578db24bfff3dd44a0e320c025a9936d7edacba69a2786d84dd932c5abb8a SHA512 1975b43fa3f3806cccc685a695f84783164c5b17da10ac14a6013d27c837cc9c63fff01b1ed4b31f22dae60afa68d34ec56ca9c45ca3dac23635e8f0fa845aa4 |
27 |
+DIST mysql-connector-c++-8.0.27-src.tar.gz 4004836 BLAKE2B e581c679d8d9a31d2570b9cf1968b4e793cfccbd4cafdc5a9c9d17a465c16faa1492b2da7bdc1679d97474c27b6353274a390668f77d3cb47f72598eb3a967fa SHA512 3da7109efd2d1af813931b923218de9a85afe20d23e2654eecfa5524431f5b11ebdb8421b14563300b66ab61714e284cc15407a3b28a87922c9a8c79b2804bf3 |
28 |
|
29 |
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 |
30 |
new file mode 100644 |
31 |
index 0000000..aadf006 |
32 |
--- /dev/null |
33 |
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-fix-build.patch |
34 |
@@ -0,0 +1,92 @@ |
35 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
36 |
+index e734714..b79ff3a 100644 |
37 |
+--- a/CMakeLists.txt |
38 |
++++ b/CMakeLists.txt |
39 |
+@@ -474,7 +474,7 @@ set_target_properties(connector PROPERTIES |
40 |
+ |
41 |
+ |
42 |
+ install(TARGETS connector |
43 |
+- CONFIGURATIONS Release RelWithDebInfo |
44 |
++ CONFIGURATIONS Release RelWithDebInfo Gentoo |
45 |
+ ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev |
46 |
+ RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll |
47 |
+ LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll |
48 |
+diff --git a/cdk/cmake/DepFindProtobuf.cmake b/cdk/cmake/DepFindProtobuf.cmake |
49 |
+index 414716c..165af4b 100644 |
50 |
+--- a/cdk/cmake/DepFindProtobuf.cmake |
51 |
++++ b/cdk/cmake/DepFindProtobuf.cmake |
52 |
+@@ -52,21 +52,7 @@ if(TARGET ext::protobuf) |
53 |
+ return() |
54 |
+ endif() |
55 |
+ |
56 |
+-message(STATUS "Setting up Protobuf.") |
57 |
+- |
58 |
+-# Setup extrnal project that builds protobuf from bundled sources |
59 |
+- |
60 |
+-add_ext(protobuf) |
61 |
+- |
62 |
+-# import targets from the external project |
63 |
+-# Note: The pb_ targets are created by protobuf/exports.cmake |
64 |
+- |
65 |
+-add_ext_targets(protobuf |
66 |
+- pb-lite pb_libprotobuf-lite |
67 |
+- pb-full pb_libprotobuf |
68 |
+- protoc pb_protoc |
69 |
+-) |
70 |
+- |
71 |
++find_package(Protobuf REQUIRED) |
72 |
+ |
73 |
+ # Standard PROTOBUF_GENERATE_CPP modified to our usage |
74 |
+ |
75 |
+@@ -95,7 +81,7 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS) |
76 |
+ "${CMAKE_CURRENT_BINARY_DIR}/protobuf/${FIL_WE}.pb.h" |
77 |
+ COMMAND ${CMAKE_COMMAND} |
78 |
+ -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/protobuf" |
79 |
+- COMMAND ext::protoc |
80 |
++ COMMAND ${Protobuf_PROTOC_EXECUTABLE} |
81 |
+ ARGS --cpp_out "${CMAKE_CURRENT_BINARY_DIR}/protobuf" |
82 |
+ -I ${ABS_PATH} ${ABS_FIL} |
83 |
+ #--proto_path=${PROTOBUF_INCLUDE_DIR} |
84 |
+diff --git a/cdk/core/CMakeLists.txt b/cdk/core/CMakeLists.txt |
85 |
+index 10cae33..3907c9b 100644 |
86 |
+--- a/cdk/core/CMakeLists.txt |
87 |
++++ b/cdk/core/CMakeLists.txt |
88 |
+@@ -45,7 +45,7 @@ add_library(cdk STATIC ${cdk_sources} ${HEADERS}) |
89 |
+ |
90 |
+ target_link_libraries(cdk |
91 |
+ PUBLIC cdk_mysqlx cdk_parser |
92 |
+- PRIVATE ext::pb-lite # required by codecc.cc |
93 |
++ PRIVATE protobuf # required by codecc.cc |
94 |
+ ) |
95 |
+ |
96 |
+ add_coverage(cdk) |
97 |
+diff --git a/cdk/protocol/mysqlx/CMakeLists.txt b/cdk/protocol/mysqlx/CMakeLists.txt |
98 |
+index a399401..b04ffa3 100644 |
99 |
+--- a/cdk/protocol/mysqlx/CMakeLists.txt |
100 |
++++ b/cdk/protocol/mysqlx/CMakeLists.txt |
101 |
+@@ -129,11 +129,7 @@ target_include_directories(cdk_proto_mysqlx PRIVATE |
102 |
+ ${CMAKE_CURRENT_BINARY_DIR} |
103 |
+ ) |
104 |
+ |
105 |
+-if(use_full_protobuf) |
106 |
+- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::pb-full) |
107 |
+-else() |
108 |
+- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::pb-lite) |
109 |
+-endif() |
110 |
++target_link_libraries(cdk_proto_mysqlx PRIVATE protobuf) |
111 |
+ |
112 |
+ target_link_libraries(cdk_proto_mysqlx |
113 |
+ PRIVATE cdk_foundation ext::zlib ext::lz4 ext::zstd |
114 |
+diff --git a/jdbc/CMakeLists.txt b/jdbc/CMakeLists.txt |
115 |
+index f4355ed..f24510b 100644 |
116 |
+--- a/jdbc/CMakeLists.txt |
117 |
++++ b/jdbc/CMakeLists.txt |
118 |
+@@ -299,7 +299,7 @@ endif() |
119 |
+ |
120 |
+ |
121 |
+ install(TARGETS connector-jdbc |
122 |
+- CONFIGURATIONS Release RelWithDebInfo |
123 |
++ CONFIGURATIONS Release RelWithDebInfo Gentoo |
124 |
+ ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT JDBCDev |
125 |
+ RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll |
126 |
+ LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll |
127 |
|
128 |
diff --git a/dev-db/mysql-connector-c++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml |
129 |
index ab2d12f..3eae39f 100644 |
130 |
--- a/dev-db/mysql-connector-c++/metadata.xml |
131 |
+++ b/dev-db/mysql-connector-c++/metadata.xml |
132 |
@@ -1,7 +1,8 @@ |
133 |
<?xml version="1.0" encoding="UTF-8"?> |
134 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
135 |
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
136 |
<pkgmetadata> |
137 |
<use> |
138 |
+ <flag name="gcov">Build coverage support</flag> |
139 |
<flag name="legacy">Build the legacy 1.x API as well as the DevX API</flag> |
140 |
</use> |
141 |
<maintainer type="project"> |
142 |
|
143 |
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 |
144 |
new file mode 100644 |
145 |
index 0000000..fef8144 |
146 |
--- /dev/null |
147 |
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27.ebuild |
148 |
@@ -0,0 +1,45 @@ |
149 |
+# Copyright 1999-2022 Gentoo Authors |
150 |
+# Distributed under the terms of the GNU General Public License v2 |
151 |
+ |
152 |
+EAPI="7" |
153 |
+ |
154 |
+CMAKE_MAKEFILE_GENERATOR=emake |
155 |
+inherit cmake |
156 |
+ |
157 |
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" |
158 |
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" |
159 |
+URI_DIR="Connector-C++" |
160 |
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz" |
161 |
+ |
162 |
+LICENSE="Artistic GPL-2" |
163 |
+SLOT="0" |
164 |
+# -ppc, -sparc for bug #711940 |
165 |
+KEYWORDS="amd64 arm ~arm64 -ppc ppc64 -sparc x86" |
166 |
+IUSE="+legacy" |
167 |
+ |
168 |
+RDEPEND=" |
169 |
+ dev-libs/protobuf:= |
170 |
+ legacy? ( |
171 |
+ dev-libs/boost:= |
172 |
+ >=dev-db/mysql-connector-c-8.0.27:= |
173 |
+ ) |
174 |
+ dev-libs/openssl:0= |
175 |
+ " |
176 |
+DEPEND="${RDEPEND}" |
177 |
+S="${WORKDIR}/${P}-src" |
178 |
+ |
179 |
+PATCHES=( |
180 |
+ "${FILESDIR}"/${PN}-8.0.27-fix-build.patch |
181 |
+ "${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch |
182 |
+) |
183 |
+ |
184 |
+src_configure() { |
185 |
+ local mycmakeargs=( |
186 |
+ -DWITH_SSL=system |
187 |
+ -DWITH_JDBC=$(usex legacy ON OFF) |
188 |
+ $(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '') |
189 |
+ $(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '') |
190 |
+ ) |
191 |
+ |
192 |
+ cmake_src_configure |
193 |
+} |