1 |
commit: 13661378f4cb21ad5a224f4cad2a814b184af2e4 |
2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
3 |
AuthorDate: Tue Jul 5 21:12:34 2022 +0000 |
4 |
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
5 |
CommitDate: Tue Jul 5 21:19:05 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=13661378 |
7 |
|
8 |
dev-db/mysql-connector-c++: Remove old versions |
9 |
|
10 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
11 |
Closes: https://github.com/gentoo/libressl/pull/436 |
12 |
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> |
13 |
|
14 |
dev-db/mysql-connector-c++/Manifest | 4 - |
15 |
.../mysql-connector-c++-8.0.19-fix-build.patch | 307 -------------------- |
16 |
...connector-c++-8.0.19-fix-libressl-support.patch | 89 ------ |
17 |
.../mysql-connector-c++-8.0.22-fix-build.patch | 322 --------------------- |
18 |
.../mysql-connector-c++-8.0.19.ebuild | 43 --- |
19 |
.../mysql-connector-c++-8.0.20.ebuild | 43 --- |
20 |
.../mysql-connector-c++-8.0.21.ebuild | 43 --- |
21 |
.../mysql-connector-c++-8.0.22.ebuild | 43 --- |
22 |
8 files changed, 894 deletions(-) |
23 |
|
24 |
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest |
25 |
index 72931be..a17ed75 100644 |
26 |
--- a/dev-db/mysql-connector-c++/Manifest |
27 |
+++ b/dev-db/mysql-connector-c++/Manifest |
28 |
@@ -1,5 +1 @@ |
29 |
-DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0 SHA512 5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1edecccc75da15d7bb0bd |
30 |
-DIST mysql-connector-c++-8.0.20-src.tar.gz 3774428 BLAKE2B a06114432ab21c36fd0b3b91df2382198b2a48871e8e0bfd8c7a94729ed0e29f33599c078c97670fe9d744b13042db52fb89de2294c75eae670a77112d11d251 SHA512 3edb7c3d4ccf218a3f76afcf83a6d233b7accd236c05105ab3f7a6610cfd8809a78c78142c82fb60fb0931d2ae0f0f8fdc3ce9caf5f0cde7ef54067a7e20270b |
31 |
-DIST mysql-connector-c++-8.0.21-src.tar.gz 3788740 BLAKE2B 1862b4f2c6e2a2bbe8e3044eea2c1d3c8fdb0a319e3758ca44686b79e917a65617e2cfd0e4b698d858ed9ef12c892b4f658eb287f2a8505a5daeeb79d9544c25 SHA512 8a64dff2efd16d2891f613fd416ec42ecba2490b428b1778e99822a3051d9c5af3b94006577e9f38a6ebd146d2f3be522cb876f1e42fbf0ac82001b0a62ffa62 |
32 |
-DIST mysql-connector-c++-8.0.22-src.tar.gz 3795112 BLAKE2B c5d6f0ebeb4649857f3217a35f3ae885d62be63af4da09815e7eb156538ece4f805578db24bfff3dd44a0e320c025a9936d7edacba69a2786d84dd932c5abb8a SHA512 1975b43fa3f3806cccc685a695f84783164c5b17da10ac14a6013d27c837cc9c63fff01b1ed4b31f22dae60afa68d34ec56ca9c45ca3dac23635e8f0fa845aa4 |
33 |
DIST mysql-connector-c++-8.0.27-src.tar.gz 4004836 BLAKE2B e581c679d8d9a31d2570b9cf1968b4e793cfccbd4cafdc5a9c9d17a465c16faa1492b2da7bdc1679d97474c27b6353274a390668f77d3cb47f72598eb3a967fa SHA512 3da7109efd2d1af813931b923218de9a85afe20d23e2654eecfa5524431f5b11ebdb8421b14563300b66ab61714e284cc15407a3b28a87922c9a8c79b2804bf3 |
34 |
|
35 |
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch |
36 |
deleted file mode 100644 |
37 |
index b897619..0000000 |
38 |
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch |
39 |
+++ /dev/null |
40 |
@@ -1,307 +0,0 @@ |
41 |
---- a/CMakeLists.txt |
42 |
-+++ b/CMakeLists.txt |
43 |
-@@ -475,7 +475,7 @@ set_target_properties(connector PROPERTIES |
44 |
- |
45 |
- |
46 |
- install(TARGETS connector |
47 |
-- CONFIGURATIONS Release RelWithDebInfo |
48 |
-+ CONFIGURATIONS Release RelWithDebInfo Gentoo |
49 |
- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev |
50 |
- RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll |
51 |
- LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll |
52 |
---- a/cdk/cmake/DepFindProtobuf.cmake |
53 |
-+++ b/cdk/cmake/DepFindProtobuf.cmake |
54 |
-@@ -48,229 +48,7 @@ if(TARGET Protobuf::pb) |
55 |
- return() |
56 |
- endif() |
57 |
- |
58 |
--message(STATUS "Setting up Protobuf.") |
59 |
-- |
60 |
--set(PB_SOURCE_DIR "${PROJECT_SOURCE_DIR}/protobuf") |
61 |
--set(PB_BINARY_DIR "${PROJECT_BINARY_DIR}/protobuf") |
62 |
--set(config_stamp "${PB_BINARY_DIR}/config.stamp") |
63 |
--set(build_stamp "${PB_BINARY_DIR}/build.stamp") |
64 |
-- |
65 |
-- |
66 |
--# |
67 |
--# Pick build configuration for the protobuf build. Normally we build using the |
68 |
--# same build configuration that is used for building CDK (Release/Debug/etc.). |
69 |
--# But we also support building CDK under non-standard build configuration |
70 |
--# named 'Static' (this is a dirty trick we use to simplify building our MSIs). |
71 |
--# Since protobuf does not know 'Static' build configuration, we build protobuf |
72 |
--# under 'Release' configuration in that case. |
73 |
--# |
74 |
--# We need to handle two cases. For some build systems, like Makefiles, |
75 |
--# the build configuration is specified at cmake time using CMAKE_BUILD_TYPE |
76 |
--# variable. In that case we also set it during protobuf build configuration. |
77 |
--# Another case is a multi-configuration build system like MSVC. In this case |
78 |
--# we use generator expression to pick correct configuration when the build |
79 |
--# command is invoked below. |
80 |
--# |
81 |
-- |
82 |
--set(build_type) |
83 |
--if(CMAKE_BUILD_TYPE) |
84 |
-- if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]") |
85 |
-- set(set_build_type -DCMAKE_BUILD_TYPE=Release) |
86 |
-- else() |
87 |
-- set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) |
88 |
-- endif() |
89 |
--endif() |
90 |
-- |
91 |
--set(CONFIG_EXPR |
92 |
-- $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>> |
93 |
--) |
94 |
-- |
95 |
--set(set_arch) |
96 |
--if(CMAKE_GENERATOR_PLATFORM) |
97 |
-- set(set_arch -A ${CMAKE_GENERATOR_PLATFORM}) |
98 |
--endif() |
99 |
-- |
100 |
--set(set_toolset) |
101 |
--if(CMAKE_GENERATOR_TOOLSET) |
102 |
-- set(set_toolset -T ${CMAKE_GENERATOR_TOOLSET}) |
103 |
--endif() |
104 |
-- |
105 |
--if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake") |
106 |
-- |
107 |
-- message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR} ${set_arch} ${set_toolset}") |
108 |
-- |
109 |
-- file(REMOVE "${PB_BINARY_DIR}/CMakeCache.txt") |
110 |
-- file(MAKE_DIRECTORY "${PB_BINARY_DIR}") |
111 |
-- |
112 |
-- # Dirty trick to speed up cmake set up time. |
113 |
-- #file( |
114 |
-- # COPY "${CMAKE_BINARY_DIR}/CMakeFiles/${CMAKE_VERSION}" |
115 |
-- # DESTINATION "${PB_BINARY_DIR}/CMakeFiles" |
116 |
-- #) |
117 |
-- |
118 |
-- execute_process( |
119 |
-- COMMAND ${CMAKE_COMMAND} |
120 |
-- -G "${CMAKE_GENERATOR}" |
121 |
-- ${set_arch} |
122 |
-- ${set_toolset} |
123 |
-- ${set_build_type} |
124 |
-- -DSTATIC_MSVCRT=${STATIC_MSVCRT} |
125 |
-- -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} |
126 |
-- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} |
127 |
-- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} |
128 |
-- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} |
129 |
-- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} |
130 |
-- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO} |
131 |
-- -DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL} |
132 |
-- -DCMAKE_STATIC_LINKER_FLAGS=${CMAKE_STATIC_LINKER_FLAGS} |
133 |
-- ${PB_SOURCE_DIR} |
134 |
-- WORKING_DIRECTORY ${PB_BINARY_DIR} |
135 |
-- RESULT_VARIABLE protobuf_config |
136 |
-- ) |
137 |
-- |
138 |
-- if(protobuf_config) |
139 |
-- message(FATAL_ERROR "Could not configure Protobuf build: ${protobuf_config}") |
140 |
-- endif() |
141 |
-- |
142 |
-- message("==== Protobuf build configured.") |
143 |
-- |
144 |
--endif() |
145 |
-- |
146 |
-- |
147 |
--include(${PB_BINARY_DIR}/exports.cmake) |
148 |
-- |
149 |
--# |
150 |
--# Protobuf library targets imported above (pb_protobuf |
151 |
--# and pb_protobuf-lite) are local to the directory from which |
152 |
--# they were imported. This is not good if cdk is used as |
153 |
--# a sub-project of a parent project, because the parent project |
154 |
--# must have access to these targets. |
155 |
--# |
156 |
--# For that reason below we create global protobuf/protobuf-lite targets |
157 |
--# and copy their locations from the imported targets. |
158 |
--# |
159 |
--# Note: we can't use ALIAS library because it does not work with imported |
160 |
--# targets |
161 |
--# |
162 |
-- |
163 |
--add_library(Protobuf::pb-full STATIC IMPORTED GLOBAL) |
164 |
--add_library(Protobuf::pb-lite STATIC IMPORTED GLOBAL) |
165 |
--add_executable(Protobuf::protoc IMPORTED GLOBAL) |
166 |
-- |
167 |
--set(TGT_protobuf Protobuf::pb-full) |
168 |
--set(TGT_protobuf-lite Protobuf::pb-lite) |
169 |
--set(TGT_protoc Protobuf::protoc) |
170 |
-- |
171 |
--foreach(tgt protobuf protobuf-lite protoc) |
172 |
-- |
173 |
-- #message("processing: ${tgt}") |
174 |
-- |
175 |
-- set(loc_list) |
176 |
-- |
177 |
-- foreach(CONF NOCONFIG DEBUG RELEASE MINSIZEREL RELWITHDEBINFO) |
178 |
-- |
179 |
-- #message("- CONF: ${CONF}") |
180 |
-- |
181 |
-- get_target_property(LOC pb_${tgt} IMPORTED_LOCATION_${CONF}) |
182 |
-- |
183 |
-- if(LOC) |
184 |
-- |
185 |
-- #message("- setting imported location to: ${LOC}") |
186 |
-- list(APPEND loc_list "${LOC}") |
187 |
-- |
188 |
-- set_target_properties(${TGT_${tgt}} PROPERTIES |
189 |
-- IMPORTED_LOCATION_${CONF} "${LOC}" |
190 |
-- ) |
191 |
-- |
192 |
-- set_property(TARGET ${TGT_${tgt}} APPEND PROPERTY |
193 |
-- IMPORTED_CONFIGURATIONS ${CONF} |
194 |
-- ) |
195 |
-- |
196 |
-- endif() |
197 |
-- |
198 |
-- endforeach(CONF) |
199 |
-- |
200 |
-- # |
201 |
-- # To support 'Static' build configuration the targets imported from the |
202 |
-- # Protobuf project need to have IMPORTED_LOCATION_STATIC defined. We use |
203 |
-- # 'Release' locations as Protobuf is built using 'Release' configuration in |
204 |
-- # that case. |
205 |
-- # |
206 |
-- |
207 |
-- get_target_property(LOC ${TGT_${tgt}} IMPORTED_LOCATION_RELEASE) |
208 |
-- set_property(TARGET ${TGT_${tgt}} PROPERTY IMPORTED_LOCATION_STATIC ${LOC}) |
209 |
-- |
210 |
--endforeach(tgt) |
211 |
-- |
212 |
-- |
213 |
--#message("Protobuf include path: ${PROTOBUF_INCLUDE_DIR}") |
214 |
--set(PROTOBUF_INCLUDE_DIR ${PROTOBUF_INCLUDE_DIR} CACHE INTERNAL "") |
215 |
-- |
216 |
--set_target_properties(Protobuf::pb-lite PROPERTIES |
217 |
-- INTERFACE_INCLUDE_DIRECTORIES "${PROTOBUF_INCLUDE_DIR}" |
218 |
--) |
219 |
-- |
220 |
--set_target_properties(Protobuf::pb-full PROPERTIES |
221 |
-- INTERFACE_LINK_LIBRARIES Protobuf::pb-lite |
222 |
--) |
223 |
-- |
224 |
--# On UNIX Protobuf uses pthread library |
225 |
--if(UNIX) |
226 |
-- set_property(TARGET Protobuf::pb-lite APPEND PROPERTY |
227 |
-- INTERFACE_LINK_LIBRARIES pthread |
228 |
-- ) |
229 |
--endif() |
230 |
-- |
231 |
--# |
232 |
--# Note: This is needed to correctly compile headers generated by protobuf |
233 |
--# with sunpro compiler. |
234 |
--# |
235 |
-- |
236 |
--if(SUNPRO) |
237 |
-- set_property(TARGET Protobuf::pb-lite APPEND PROPERTY |
238 |
-- INTERFACE_COMPILE_DEFINITIONS SOLARIS_64BIT_ENABLED |
239 |
-- ) |
240 |
--endif() |
241 |
-- |
242 |
--# |
243 |
--# Try using parallel builds for protobuf. |
244 |
--# |
245 |
-- |
246 |
--include(ProcessorCount) |
247 |
--ProcessorCount(N) |
248 |
-- |
249 |
--MESSAGE("Processor Count: ${N}") |
250 |
-- |
251 |
--set(opt_build) |
252 |
--set(opt_tool) |
253 |
--if(NOT N EQUAL 0) |
254 |
-- if(NOT CMAKE_VERSION VERSION_LESS 3.12) |
255 |
-- set(opt_build --parallel ${N}) |
256 |
-- elseif(CMAKE_MAKE_PROGRAM MATCHES "make") |
257 |
-- set(opt_tool -j${N}) |
258 |
-- endif() |
259 |
--endif() |
260 |
-- |
261 |
--add_custom_command(OUTPUT "${build_stamp}" |
262 |
-- COMMAND ${CMAKE_COMMAND} --build . ${opt_build} --config ${CONFIG_EXPR} -- ${opt_tool} |
263 |
-- COMMAND ${CMAKE_COMMAND} -E touch "${build_stamp}" |
264 |
-- WORKING_DIRECTORY "${PB_BINARY_DIR}" |
265 |
-- COMMENT "Building protobuf" |
266 |
--) |
267 |
-- |
268 |
--add_custom_target(build_protobuf |
269 |
-- SOURCES "${build_stamp}" |
270 |
--) |
271 |
-- |
272 |
--set_target_properties(build_protobuf PROPERTIES FOLDER "Misc") |
273 |
-- |
274 |
--add_dependencies(Protobuf::pb-full build_protobuf) |
275 |
--add_dependencies(Protobuf::pb-lite build_protobuf) |
276 |
--add_dependencies(Protobuf::protoc build_protobuf) |
277 |
-- |
278 |
--# TODO: Handle lite/full version |
279 |
-- |
280 |
-- |
281 |
-+find_package(Protobuf REQUIRED) |
282 |
- |
283 |
- # Standard PROTOBUF_GENERATE_CPP modified to our usage |
284 |
- |
285 |
-@@ -299,11 +77,11 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS) |
286 |
- "${CMAKE_CURRENT_BINARY_DIR}/protobuf/${FIL_WE}.pb.h" |
287 |
- COMMAND ${CMAKE_COMMAND} |
288 |
- -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/protobuf" |
289 |
-- COMMAND Protobuf::protoc |
290 |
-+ COMMAND ${Protobuf_PROTOC_EXECUTABLE} |
291 |
- ARGS --cpp_out "${CMAKE_CURRENT_BINARY_DIR}/protobuf" |
292 |
- -I ${ABS_PATH} ${ABS_FIL} |
293 |
-- --proto_path=${PROJECT_SOURCE_DIR}/protobuf/protobuf-3.6.1/src |
294 |
-- DEPENDS ${ABS_FIL} #${PROTOBUF_PROTOC_EXECUTABLE} |
295 |
-+ --proto_path=${Protobuf_INCLUDE_DIR} |
296 |
-+ DEPENDS ${ABS_FIL} #${Protobuf_PROTOC_EXECUTABLE} |
297 |
- COMMENT "Running C++ protocol buffer compiler on ${FIL}" |
298 |
- VERBATIM |
299 |
- ) |
300 |
---- a/cdk/core/CMakeLists.txt |
301 |
-+++ b/cdk/core/CMakeLists.txt |
302 |
-@@ -44,7 +44,7 @@ add_library(cdk STATIC ${cdk_sources} ${HEADERS}) |
303 |
- |
304 |
- target_link_libraries(cdk |
305 |
- PUBLIC cdk_mysqlx cdk_parser |
306 |
-- PRIVATE Protobuf::pb-lite # required by codecc.cc |
307 |
-+ PRIVATE protobuf # required by codecc.cc |
308 |
- ) |
309 |
- |
310 |
- add_coverage(cdk) |
311 |
---- a/cdk/protocol/mysqlx/CMakeLists.txt |
312 |
-+++ b/cdk/protocol/mysqlx/CMakeLists.txt |
313 |
-@@ -126,11 +126,7 @@ target_include_directories(cdk_proto_mysqlx PRIVATE |
314 |
- ${CMAKE_CURRENT_BINARY_DIR} |
315 |
- ) |
316 |
- |
317 |
--if(use_full_protobuf) |
318 |
-- target_link_libraries(cdk_proto_mysqlx PRIVATE Protobuf::pb-full) |
319 |
--else() |
320 |
-- target_link_libraries(cdk_proto_mysqlx PRIVATE Protobuf::pb-lite) |
321 |
--endif() |
322 |
-+target_link_libraries(cdk_proto_mysqlx PRIVATE protobuf) |
323 |
- |
324 |
- target_link_libraries(cdk_proto_mysqlx PRIVATE cdk_foundation) |
325 |
- |
326 |
---- a/jdbc.cmake |
327 |
-+++ b/jdbc.cmake |
328 |
-@@ -66,7 +66,7 @@ if(MYSQL_CONFIG_EXECUTABLE) |
329 |
- list(APPEND jdbc_cmake_opts -DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE}) |
330 |
- endif() |
331 |
- |
332 |
--list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON) |
333 |
-+list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=OFF) |
334 |
- |
335 |
- if(CMAKE_BUILD_TYPE) |
336 |
- if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]") |
337 |
---- a/jdbc/CMakeLists.txt |
338 |
-+++ b/jdbc/CMakeLists.txt |
339 |
-@@ -272,7 +272,7 @@ set_target_properties(connector-jdbc |
340 |
- |
341 |
- |
342 |
- install(TARGETS connector-jdbc |
343 |
-- CONFIGURATIONS Release RelWithDebInfo |
344 |
-+ CONFIGURATIONS Release RelWithDebInfo Gentoo |
345 |
- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT JDBCDev |
346 |
- RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll |
347 |
- LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll |
348 |
|
349 |
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch |
350 |
deleted file mode 100644 |
351 |
index fc6eb77..0000000 |
352 |
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch |
353 |
+++ /dev/null |
354 |
@@ -1,89 +0,0 @@ |
355 |
---- a/cdk/cmake/DepFindSSL.cmake |
356 |
-+++ b/cdk/cmake/DepFindSSL.cmake |
357 |
-@@ -88,7 +88,7 @@ function(main) |
358 |
- |
359 |
- set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "") |
360 |
- |
361 |
-- if(NOT OPENSSL_VERSION_MAJOR EQUAL 1) |
362 |
-+ if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1) |
363 |
- message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found") |
364 |
- else() |
365 |
- message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}") |
366 |
-@@ -182,42 +182,33 @@ function(find_openssl) |
367 |
- set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}" PARENT_SCOPE) |
368 |
- message("-- found OpenSSL headers at: ${OPENSSL_INCLUDE_DIR}") |
369 |
- |
370 |
-- |
371 |
- # Verify version number. Version information looks like: |
372 |
-- # #define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a 20 Nov 2018" |
373 |
-- |
374 |
-+ # #define OPENSSL_VERSION_NUMBER 0x1000103fL |
375 |
-+ # Encoded as MNNFFPPS: major minor fix patch status |
376 |
- FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" |
377 |
- OPENSSL_VERSION_NUMBER |
378 |
-- REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT" |
379 |
-+ REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" |
380 |
- ) |
381 |
-- |
382 |
-- #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}") |
383 |
- STRING(REGEX REPLACE |
384 |
-- "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]*)[\t ].*$" |
385 |
-- "\\1;\\2;\\3;\\4" |
386 |
-- version_list "${OPENSSL_VERSION_NUMBER}" |
387 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" |
388 |
-+ OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}" |
389 |
-+ ) |
390 |
-+ STRING(REGEX REPLACE |
391 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" |
392 |
-+ OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}" |
393 |
-+ ) |
394 |
-+ STRING(REGEX REPLACE |
395 |
-+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" |
396 |
-+ OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}" |
397 |
- ) |
398 |
-- #message("-- OPENSSL_VERSION: ${version_list}") |
399 |
-- |
400 |
-- list(GET version_list 0 OPENSSL_VERSION_MAJOR) |
401 |
-- math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR}) |
402 |
-- |
403 |
-- list(GET version_list 1 OPENSSL_VERSION_MINOR) |
404 |
-- math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR}) |
405 |
-- |
406 |
-- list(GET version_list 2 OPENSSL_VERSION_FIX) |
407 |
-- math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX}) |
408 |
-- |
409 |
-- list(GET version_list 3 OPENSSL_VERSION_PATCH) |
410 |
-- |
411 |
-- |
412 |
- |
413 |
- set(OPENSSL_VERSION |
414 |
-- "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}" |
415 |
-+ "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}" |
416 |
- PARENT_SCOPE |
417 |
- ) |
418 |
- set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE) |
419 |
- |
420 |
-+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) |
421 |
- |
422 |
- find_library(OPENSSL_LIBRARY |
423 |
- NAMES ssl ssleay32 ssleay32MD libssl |
424 |
---- a/cdk/foundation/connection_openssl.cc |
425 |
-+++ b/cdk/foundation/connection_openssl.cc |
426 |
-@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err) |
427 |
- case SSL_ERROR_WANT_CONNECT: |
428 |
- case SSL_ERROR_WANT_ACCEPT: |
429 |
- case SSL_ERROR_WANT_X509_LOOKUP: |
430 |
--# if OPENSSL_VERSION_NUMBER >= 0x10100000L |
431 |
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) |
432 |
- case SSL_ERROR_WANT_ASYNC: |
433 |
- case SSL_ERROR_WANT_ASYNC_JOB: |
434 |
- # endif |
435 |
-@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx) |
436 |
- |
437 |
- SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str()); |
438 |
- |
439 |
--#if OPENSSL_VERSION_NUMBER>=0x1010100fL |
440 |
-+#if HAVE_TLS1_3_VERSION |
441 |
- |
442 |
- /* |
443 |
- Note: If TLSv1.3 is not enabled, there is no need to restrict |
444 |
|
445 |
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.22-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.22-fix-build.patch |
446 |
deleted file mode 100644 |
447 |
index ca1b829..0000000 |
448 |
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.22-fix-build.patch |
449 |
+++ /dev/null |
450 |
@@ -1,322 +0,0 @@ |
451 |
---- a/CMakeLists.txt |
452 |
-+++ b/CMakeLists.txt |
453 |
-@@ -467,7 +467,7 @@ set_target_properties(connector PROPERTIES |
454 |
- |
455 |
- |
456 |
- install(TARGETS connector |
457 |
-- CONFIGURATIONS Release RelWithDebInfo |
458 |
-+ CONFIGURATIONS Release RelWithDebInfo Gentoo |
459 |
- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev |
460 |
- RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll |
461 |
- LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll |
462 |
---- a/cdk/cmake/DepFindProtobuf.cmake |
463 |
-+++ b/cdk/cmake/DepFindProtobuf.cmake |
464 |
-@@ -48,244 +48,7 @@ if(TARGET Protobuf::pb) |
465 |
- return() |
466 |
- endif() |
467 |
- |
468 |
--message(STATUS "Setting up Protobuf.") |
469 |
-- |
470 |
--set(PB_SOURCE_DIR "${PROJECT_SOURCE_DIR}/protobuf") |
471 |
--set(PB_BINARY_DIR "${PROJECT_BINARY_DIR}/protobuf") |
472 |
--set(config_stamp "${PB_BINARY_DIR}/config.stamp") |
473 |
--set(build_stamp "${PB_BINARY_DIR}/build.stamp") |
474 |
-- |
475 |
-- |
476 |
--# |
477 |
--# Pick build configuration for the protobuf build. Normally we build using the |
478 |
--# same build configuration that is used for building CDK (Release/Debug/etc.). |
479 |
--# But we also support building CDK under non-standard build configuration |
480 |
--# named 'Static' (this is a dirty trick we use to simplify building our MSIs). |
481 |
--# Since protobuf does not know 'Static' build configuration, we build protobuf |
482 |
--# under 'Release' configuration in that case. |
483 |
--# |
484 |
--# We need to handle two cases. For some build systems, like Makefiles, |
485 |
--# the build configuration is specified at cmake time using CMAKE_BUILD_TYPE |
486 |
--# variable. In that case we also set it during protobuf build configuration. |
487 |
--# Another case is a multi-configuration build system like MSVC. In this case |
488 |
--# we use generator expression to pick correct configuration when the build |
489 |
--# command is invoked below. |
490 |
--# |
491 |
-- |
492 |
--set(build_type) |
493 |
--if(CMAKE_BUILD_TYPE) |
494 |
-- if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]") |
495 |
-- set(set_build_type -DCMAKE_BUILD_TYPE=Release) |
496 |
-- else() |
497 |
-- set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) |
498 |
-- endif() |
499 |
--endif() |
500 |
-- |
501 |
--set(CONFIG_EXPR |
502 |
-- $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>> |
503 |
--) |
504 |
-- |
505 |
--set(set_arch) |
506 |
--if(CMAKE_GENERATOR_PLATFORM) |
507 |
-- set(set_arch -A ${CMAKE_GENERATOR_PLATFORM}) |
508 |
--endif() |
509 |
-- |
510 |
--set(set_toolset) |
511 |
--if(CMAKE_GENERATOR_TOOLSET) |
512 |
-- set(set_toolset -T ${CMAKE_GENERATOR_TOOLSET}) |
513 |
--endif() |
514 |
-- |
515 |
--set(set_system_name) |
516 |
--if(CMAKE_SYSTEM_NAME) |
517 |
-- set(set_system_name -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}) |
518 |
-- if(CMAKE_SYSTEM_VERSION) |
519 |
-- list(APPEND set_system_name -DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION}) |
520 |
-- endif() |
521 |
--endif() |
522 |
-- |
523 |
--set(set_system_processor) |
524 |
--if(CMAKE_SYSTEM_PROCESSOR) |
525 |
-- set(set_system_processor -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}) |
526 |
--endif() |
527 |
-- |
528 |
--if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake") |
529 |
-- |
530 |
-- message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR} ${set_arch} ${set_toolset} ${set_system_name}") |
531 |
-- |
532 |
-- file(REMOVE "${PB_BINARY_DIR}/CMakeCache.txt") |
533 |
-- file(MAKE_DIRECTORY "${PB_BINARY_DIR}") |
534 |
-- |
535 |
-- # Dirty trick to speed up cmake set up time. |
536 |
-- #file( |
537 |
-- # COPY "${CMAKE_BINARY_DIR}/CMakeFiles/${CMAKE_VERSION}" |
538 |
-- # DESTINATION "${PB_BINARY_DIR}/CMakeFiles" |
539 |
-- #) |
540 |
-- |
541 |
-- execute_process( |
542 |
-- COMMAND ${CMAKE_COMMAND} |
543 |
-- -G "${CMAKE_GENERATOR}" |
544 |
-- ${set_arch} |
545 |
-- ${set_toolset} |
546 |
-- ${set_build_type} |
547 |
-- ${set_system_name} |
548 |
-- ${set_system_processor} |
549 |
-- -DSTATIC_MSVCRT=${STATIC_MSVCRT} |
550 |
-- -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} |
551 |
-- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} |
552 |
-- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} |
553 |
-- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} |
554 |
-- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} |
555 |
-- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO} |
556 |
-- -DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL} |
557 |
-- -DCMAKE_STATIC_LINKER_FLAGS=${CMAKE_STATIC_LINKER_FLAGS} |
558 |
-- ${PB_SOURCE_DIR} |
559 |
-- WORKING_DIRECTORY ${PB_BINARY_DIR} |
560 |
-- RESULT_VARIABLE protobuf_config |
561 |
-- ) |
562 |
-- |
563 |
-- if(protobuf_config) |
564 |
-- message(FATAL_ERROR "Could not configure Protobuf build: ${protobuf_config}") |
565 |
-- endif() |
566 |
-- |
567 |
-- message("==== Protobuf build configured.") |
568 |
-- |
569 |
--endif() |
570 |
-- |
571 |
-- |
572 |
--include(${PB_BINARY_DIR}/exports.cmake) |
573 |
-- |
574 |
--# |
575 |
--# Protobuf library targets imported above (pb_protobuf |
576 |
--# and pb_protobuf-lite) are local to the directory from which |
577 |
--# they were imported. This is not good if cdk is used as |
578 |
--# a sub-project of a parent project, because the parent project |
579 |
--# must have access to these targets. |
580 |
--# |
581 |
--# For that reason below we create global protobuf/protobuf-lite targets |
582 |
--# and copy their locations from the imported targets. |
583 |
--# |
584 |
--# Note: we can't use ALIAS library because it does not work with imported |
585 |
--# targets |
586 |
--# |
587 |
-- |
588 |
--add_library(Protobuf::pb-full STATIC IMPORTED GLOBAL) |
589 |
--add_library(Protobuf::pb-lite STATIC IMPORTED GLOBAL) |
590 |
--add_executable(Protobuf::protoc IMPORTED GLOBAL) |
591 |
-- |
592 |
--set(TGT_protobuf Protobuf::pb-full) |
593 |
--set(TGT_protobuf-lite Protobuf::pb-lite) |
594 |
--set(TGT_protoc Protobuf::protoc) |
595 |
-- |
596 |
--foreach(tgt protobuf protobuf-lite protoc) |
597 |
-- |
598 |
-- #message("processing: ${tgt}") |
599 |
-- |
600 |
-- set(loc_list) |
601 |
-- |
602 |
-- foreach(CONF NOCONFIG DEBUG RELEASE MINSIZEREL RELWITHDEBINFO) |
603 |
-- |
604 |
-- #message("- CONF: ${CONF}") |
605 |
-- |
606 |
-- get_target_property(LOC pb_${tgt} IMPORTED_LOCATION_${CONF}) |
607 |
-- |
608 |
-- if(LOC) |
609 |
-- |
610 |
-- #message("- setting imported location to: ${LOC}") |
611 |
-- list(APPEND loc_list "${LOC}") |
612 |
-- |
613 |
-- set_target_properties(${TGT_${tgt}} PROPERTIES |
614 |
-- IMPORTED_LOCATION_${CONF} "${LOC}" |
615 |
-- ) |
616 |
-- |
617 |
-- set_property(TARGET ${TGT_${tgt}} APPEND PROPERTY |
618 |
-- IMPORTED_CONFIGURATIONS ${CONF} |
619 |
-- ) |
620 |
-- |
621 |
-- endif() |
622 |
-- |
623 |
-- endforeach(CONF) |
624 |
-- |
625 |
-- # |
626 |
-- # To support 'Static' build configuration the targets imported from the |
627 |
-- # Protobuf project need to have IMPORTED_LOCATION_STATIC defined. We use |
628 |
-- # 'Release' locations as Protobuf is built using 'Release' configuration in |
629 |
-- # that case. |
630 |
-- # |
631 |
-- |
632 |
-- get_target_property(LOC ${TGT_${tgt}} IMPORTED_LOCATION_RELEASE) |
633 |
-- set_property(TARGET ${TGT_${tgt}} PROPERTY IMPORTED_LOCATION_STATIC ${LOC}) |
634 |
-- |
635 |
--endforeach(tgt) |
636 |
-- |
637 |
-- |
638 |
--#message("Protobuf include path: ${PROTOBUF_INCLUDE_DIR}") |
639 |
--set(PROTOBUF_INCLUDE_DIR ${PROTOBUF_INCLUDE_DIR} CACHE INTERNAL "") |
640 |
-- |
641 |
--set_target_properties(Protobuf::pb-lite PROPERTIES |
642 |
-- INTERFACE_INCLUDE_DIRECTORIES "${PROTOBUF_INCLUDE_DIR}" |
643 |
--) |
644 |
-- |
645 |
--set_target_properties(Protobuf::pb-full PROPERTIES |
646 |
-- INTERFACE_LINK_LIBRARIES Protobuf::pb-lite |
647 |
--) |
648 |
-- |
649 |
--# On UNIX Protobuf uses pthread library |
650 |
--if(UNIX) |
651 |
-- set_property(TARGET Protobuf::pb-lite APPEND PROPERTY |
652 |
-- INTERFACE_LINK_LIBRARIES pthread |
653 |
-- ) |
654 |
--endif() |
655 |
-- |
656 |
--# |
657 |
--# Note: This is needed to correctly compile headers generated by protobuf |
658 |
--# with sunpro compiler. |
659 |
--# |
660 |
-- |
661 |
--if(SUNPRO) |
662 |
-- set_property(TARGET Protobuf::pb-lite APPEND PROPERTY |
663 |
-- INTERFACE_COMPILE_DEFINITIONS SOLARIS_64BIT_ENABLED |
664 |
-- ) |
665 |
--endif() |
666 |
-- |
667 |
--# |
668 |
--# Try using parallel builds for protobuf. |
669 |
--# |
670 |
-- |
671 |
--include(ProcessorCount) |
672 |
--ProcessorCount(N) |
673 |
-- |
674 |
--MESSAGE("Processor Count: ${N}") |
675 |
-- |
676 |
--set(opt_build) |
677 |
--set(opt_tool) |
678 |
--if(NOT N EQUAL 0) |
679 |
-- if(NOT CMAKE_VERSION VERSION_LESS 3.12) |
680 |
-- set(opt_build --parallel ${N}) |
681 |
-- elseif(CMAKE_MAKE_PROGRAM MATCHES "make") |
682 |
-- set(opt_tool -j${N}) |
683 |
-- endif() |
684 |
--endif() |
685 |
-- |
686 |
--add_custom_command(OUTPUT "${build_stamp}" |
687 |
-- COMMAND ${CMAKE_COMMAND} --build . ${opt_build} --config ${CONFIG_EXPR} -- ${opt_tool} |
688 |
-- COMMAND ${CMAKE_COMMAND} -E touch "${build_stamp}" |
689 |
-- WORKING_DIRECTORY "${PB_BINARY_DIR}" |
690 |
-- COMMENT "Building protobuf" |
691 |
--) |
692 |
-- |
693 |
--add_custom_target(build_protobuf |
694 |
-- SOURCES "${build_stamp}" |
695 |
--) |
696 |
-- |
697 |
--set_target_properties(build_protobuf PROPERTIES FOLDER "Misc") |
698 |
-- |
699 |
--add_dependencies(Protobuf::pb-full build_protobuf) |
700 |
--add_dependencies(Protobuf::pb-lite build_protobuf) |
701 |
--add_dependencies(Protobuf::protoc build_protobuf) |
702 |
-- |
703 |
--# TODO: Handle lite/full version |
704 |
-- |
705 |
-- |
706 |
-+find_package(Protobuf REQUIRED) |
707 |
- |
708 |
- # Standard PROTOBUF_GENERATE_CPP modified to our usage |
709 |
- |
710 |
-@@ -314,11 +77,11 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS) |
711 |
- "${CMAKE_CURRENT_BINARY_DIR}/protobuf/${FIL_WE}.pb.h" |
712 |
- COMMAND ${CMAKE_COMMAND} |
713 |
- -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/protobuf" |
714 |
-- COMMAND Protobuf::protoc |
715 |
-+ COMMAND ${Protobuf_PROTOC_EXECUTABLE} |
716 |
- ARGS --cpp_out "${CMAKE_CURRENT_BINARY_DIR}/protobuf" |
717 |
- -I ${ABS_PATH} ${ABS_FIL} |
718 |
-- --proto_path=${PROJECT_SOURCE_DIR}/protobuf/protobuf-3.6.1/src |
719 |
-- DEPENDS ${ABS_FIL} #${PROTOBUF_PROTOC_EXECUTABLE} |
720 |
-+ --proto_path=${Protobuf_INCLUDE_DIR} |
721 |
-+ DEPENDS ${ABS_FIL} #${Protobuf_PROTOC_EXECUTABLE} |
722 |
- COMMENT "Running C++ protocol buffer compiler on ${FIL}" |
723 |
- VERBATIM |
724 |
- ) |
725 |
---- a/cdk/core/CMakeLists.txt |
726 |
-+++ b/cdk/core/CMakeLists.txt |
727 |
-@@ -45,7 +45,7 @@ add_library(cdk STATIC ${cdk_sources} ${HEADERS}) |
728 |
- |
729 |
- target_link_libraries(cdk |
730 |
- PUBLIC cdk_mysqlx cdk_parser |
731 |
-- PRIVATE Protobuf::pb-lite # required by codecc.cc |
732 |
-+ PRIVATE protobuf # required by codecc.cc |
733 |
- ) |
734 |
- |
735 |
- add_coverage(cdk) |
736 |
---- a/cdk/protocol/mysqlx/CMakeLists.txt |
737 |
-+++ b/cdk/protocol/mysqlx/CMakeLists.txt |
738 |
-@@ -127,11 +127,7 @@ target_include_directories(cdk_proto_mysqlx PRIVATE |
739 |
- ${CMAKE_CURRENT_BINARY_DIR} |
740 |
- ) |
741 |
- |
742 |
--if(use_full_protobuf) |
743 |
-- target_link_libraries(cdk_proto_mysqlx PRIVATE Protobuf::pb-full) |
744 |
--else() |
745 |
-- target_link_libraries(cdk_proto_mysqlx PRIVATE Protobuf::pb-lite) |
746 |
--endif() |
747 |
-+target_link_libraries(cdk_proto_mysqlx PRIVATE protobuf) |
748 |
- |
749 |
- target_link_libraries(cdk_proto_mysqlx PRIVATE cdk_foundation zlib lz4 zstd) |
750 |
- |
751 |
---- a/jdbc.cmake |
752 |
-+++ b/jdbc.cmake |
753 |
-@@ -66,7 +66,7 @@ if(MYSQL_CONFIG_EXECUTABLE) |
754 |
- list(APPEND jdbc_cmake_opts -DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE}) |
755 |
- endif() |
756 |
- |
757 |
--list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON) |
758 |
-+list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=OFF) |
759 |
- |
760 |
- if(CMAKE_BUILD_TYPE) |
761 |
- if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]") |
762 |
---- a/jdbc/CMakeLists.txt |
763 |
-+++ b/jdbc/CMakeLists.txt |
764 |
-@@ -299,7 +299,7 @@ endif() |
765 |
- |
766 |
- |
767 |
- install(TARGETS connector-jdbc |
768 |
-- CONFIGURATIONS Release RelWithDebInfo |
769 |
-+ CONFIGURATIONS Release RelWithDebInfo Gentoo |
770 |
- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT JDBCDev |
771 |
- RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll |
772 |
- LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll |
773 |
|
774 |
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild |
775 |
deleted file mode 100644 |
776 |
index 5b96761..0000000 |
777 |
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild |
778 |
+++ /dev/null |
779 |
@@ -1,43 +0,0 @@ |
780 |
-# Copyright 1999-2021 Gentoo Authors |
781 |
-# Distributed under the terms of the GNU General Public License v2 |
782 |
- |
783 |
-EAPI="7" |
784 |
- |
785 |
-CMAKE_MAKEFILE_GENERATOR=emake |
786 |
-inherit cmake-utils |
787 |
- |
788 |
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" |
789 |
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" |
790 |
-URI_DIR="Connector-C++" |
791 |
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz" |
792 |
- |
793 |
-LICENSE="Artistic GPL-2" |
794 |
-SLOT="0" |
795 |
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86" |
796 |
-IUSE="+legacy" |
797 |
- |
798 |
-RDEPEND=" |
799 |
- dev-libs/protobuf:= |
800 |
- legacy? ( |
801 |
- dev-libs/boost:= |
802 |
- >=dev-db/mysql-connector-c-6.1.8:= |
803 |
- ) |
804 |
- dev-libs/openssl:0=" |
805 |
-DEPEND="${RDEPEND}" |
806 |
-S="${WORKDIR}/${P}-src" |
807 |
- |
808 |
-PATCHES=( |
809 |
- "${FILESDIR}"/${PN}-8.0.19-fix-build.patch |
810 |
- "${FILESDIR}"/${PN}-8.0.19-fix-libressl-support.patch |
811 |
-) |
812 |
- |
813 |
-src_configure() { |
814 |
- local mycmakeargs=( |
815 |
- -DWITH_SSL=system |
816 |
- -DWITH_JDBC=$(usex legacy ON OFF) |
817 |
- $(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '') |
818 |
- $(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '') |
819 |
- ) |
820 |
- |
821 |
- cmake-utils_src_configure |
822 |
-} |
823 |
|
824 |
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild |
825 |
deleted file mode 100644 |
826 |
index 2bf0570..0000000 |
827 |
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild |
828 |
+++ /dev/null |
829 |
@@ -1,43 +0,0 @@ |
830 |
-# Copyright 1999-2021 Gentoo Authors |
831 |
-# Distributed under the terms of the GNU General Public License v2 |
832 |
- |
833 |
-EAPI="7" |
834 |
- |
835 |
-CMAKE_MAKEFILE_GENERATOR=emake |
836 |
-inherit cmake-utils |
837 |
- |
838 |
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" |
839 |
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" |
840 |
-URI_DIR="Connector-C++" |
841 |
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz" |
842 |
- |
843 |
-LICENSE="Artistic GPL-2" |
844 |
-SLOT="0" |
845 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" |
846 |
-IUSE="+legacy" |
847 |
- |
848 |
-RDEPEND=" |
849 |
- dev-libs/protobuf:= |
850 |
- legacy? ( |
851 |
- dev-libs/boost:= |
852 |
- >=dev-db/mysql-connector-c-6.1.8:= |
853 |
- ) |
854 |
- dev-libs/openssl:0=" |
855 |
-DEPEND="${RDEPEND}" |
856 |
-S="${WORKDIR}/${P}-src" |
857 |
- |
858 |
-PATCHES=( |
859 |
- "${FILESDIR}"/${PN}-8.0.19-fix-build.patch |
860 |
- "${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch |
861 |
-) |
862 |
- |
863 |
-src_configure() { |
864 |
- local mycmakeargs=( |
865 |
- -DWITH_SSL=system |
866 |
- -DWITH_JDBC=$(usex legacy ON OFF) |
867 |
- $(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '') |
868 |
- $(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '') |
869 |
- ) |
870 |
- |
871 |
- cmake-utils_src_configure |
872 |
-} |
873 |
|
874 |
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild |
875 |
deleted file mode 100644 |
876 |
index d83b4ad..0000000 |
877 |
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild |
878 |
+++ /dev/null |
879 |
@@ -1,43 +0,0 @@ |
880 |
-# Copyright 1999-2021 Gentoo Authors |
881 |
-# Distributed under the terms of the GNU General Public License v2 |
882 |
- |
883 |
-EAPI="7" |
884 |
- |
885 |
-CMAKE_MAKEFILE_GENERATOR=emake |
886 |
-inherit cmake |
887 |
- |
888 |
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" |
889 |
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" |
890 |
-URI_DIR="Connector-C++" |
891 |
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz" |
892 |
- |
893 |
-LICENSE="Artistic GPL-2" |
894 |
-SLOT="0" |
895 |
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86" |
896 |
-IUSE="+legacy" |
897 |
- |
898 |
-RDEPEND=" |
899 |
- dev-libs/protobuf:= |
900 |
- legacy? ( |
901 |
- dev-libs/boost:= |
902 |
- >=dev-db/mysql-connector-c-6.1.8:= |
903 |
- ) |
904 |
- dev-libs/openssl:0=" |
905 |
-DEPEND="${RDEPEND}" |
906 |
-S="${WORKDIR}/${P}-src" |
907 |
- |
908 |
-PATCHES=( |
909 |
- "${FILESDIR}"/${PN}-8.0.19-fix-build.patch |
910 |
- "${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch |
911 |
-) |
912 |
- |
913 |
-src_configure() { |
914 |
- local mycmakeargs=( |
915 |
- -DWITH_SSL=system |
916 |
- -DWITH_JDBC=$(usex legacy ON OFF) |
917 |
- $(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '') |
918 |
- $(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '') |
919 |
- ) |
920 |
- |
921 |
- cmake_src_configure |
922 |
-} |
923 |
|
924 |
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild |
925 |
deleted file mode 100644 |
926 |
index ce5c859..0000000 |
927 |
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild |
928 |
+++ /dev/null |
929 |
@@ -1,43 +0,0 @@ |
930 |
-# Copyright 1999-2021 Gentoo Authors |
931 |
-# Distributed under the terms of the GNU General Public License v2 |
932 |
- |
933 |
-EAPI="7" |
934 |
- |
935 |
-CMAKE_MAKEFILE_GENERATOR=emake |
936 |
-inherit cmake |
937 |
- |
938 |
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" |
939 |
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" |
940 |
-URI_DIR="Connector-C++" |
941 |
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz" |
942 |
- |
943 |
-LICENSE="Artistic GPL-2" |
944 |
-SLOT="0" |
945 |
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86" |
946 |
-IUSE="+legacy" |
947 |
- |
948 |
-RDEPEND=" |
949 |
- dev-libs/protobuf:= |
950 |
- legacy? ( |
951 |
- dev-libs/boost:= |
952 |
- >=dev-db/mysql-connector-c-6.1.8:= |
953 |
- ) |
954 |
- dev-libs/openssl:0=" |
955 |
-DEPEND="${RDEPEND}" |
956 |
-S="${WORKDIR}/${P}-src" |
957 |
- |
958 |
-PATCHES=( |
959 |
- "${FILESDIR}"/${PN}-8.0.22-fix-build.patch |
960 |
- "${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch |
961 |
-) |
962 |
- |
963 |
-src_configure() { |
964 |
- local mycmakeargs=( |
965 |
- -DWITH_SSL=system |
966 |
- -DWITH_JDBC=$(usex legacy ON OFF) |
967 |
- $(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '') |
968 |
- $(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '') |
969 |
- ) |
970 |
- |
971 |
- cmake_src_configure |
972 |
-} |