diff options
Diffstat (limited to 'dev-db/mysql-connector-c++')
-rw-r--r-- | dev-db/mysql-connector-c++/Manifest | 16 | ||||
-rw-r--r-- | dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch | 15 | ||||
-rw-r--r-- | dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch | 45 | ||||
-rw-r--r-- | dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.15-fix-build.patch | 307 | ||||
-rw-r--r-- | dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch (renamed from dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.18-fix-build.patch) | 46 | ||||
-rw-r--r-- | dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch | 89 | ||||
-rw-r--r-- | dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild | 63 | ||||
-rw-r--r-- | dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild | 62 | ||||
-rw-r--r-- | dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild | 41 | ||||
-rw-r--r-- | dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild (renamed from dev-db/mysql-connector-c++/mysql-connector-c++-8.0.18.ebuild) | 5 |
10 files changed, 135 insertions, 554 deletions
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest index d9d3bb62f097..982b1c37c488 100644 --- a/dev-db/mysql-connector-c++/Manifest +++ b/dev-db/mysql-connector-c++/Manifest @@ -1,17 +1,9 @@ -AUX mysql-connector-c++-1.1.11-fix-cpp-linking.patch 440 BLAKE2B 2b78f683c8e4645df7a306783ec3e61263682688b0069fff61cb3a85575d41aa33de481314bc1d18f8a5181c5e2dbb29cfb8c89d6a36b44c11f27340b4f7921c SHA512 f941e32d4f1e52d603958bb01d17e75c8fb89738d20f5af29d4c30bbe77ba82af4b25cc27f1e2df934d1b309f6c75faf2fb0fc88fb250770a0669f867cc16e1c AUX mysql-connector-c++-1.1.11-fix-mariadb.patch 1939 BLAKE2B 4ca552777bfcb8671e5dc0213c411f9e1e8fbcbeb0f9f3369572c82ba03304a9df2ab98725b1fb3a365a63e4c8ed9d3d86332c54ffcb14210469b3d6078d89da SHA512 3d02972b57a0c2a544edef9ec5050c82f9214a7013e941cdc13a8f0742b7608812f33bc0c84367e70ea556562efb653297730ce5fc8d928458c5af1d71f3f60a AUX mysql-connector-c++-1.1.6-fix-cmake.patch 762 BLAKE2B 4cecebd2cb075c6e1af7ab74a84132f41beeeb202d4d286038b05cbbb202cef709e7114563bdbee12aab4e6a738a9e23bbb9455fc1ce0f906d952af4e0042f05 SHA512 c4c89b398aa88a9e7b4ed4cf42b055b79670dc70685775afd1ef2d683e5b3754575c831a6083ef0d097431e796513597e1daf7737e3ade710abad917f63ed32f -AUX mysql-connector-c++-1.1.8-fix-mariadb.patch 1939 BLAKE2B f2d2528cacfa4457c20587557e5125f9d642ce162319ba6b077173b5407319d8d07e6b525a5fb95e797d43a3ad4e9ceb111ebd07a52cf38df1db71b9b4f2ab4c SHA512 66e4783b2ad2db463b243d2fcd7c4f89f1ddbb02f6c5711adb09b402bb448e4ee69b50f635c60201cf63048aebaea25b5db6a18f46b35b25e8d7920dbcfde9bd -AUX mysql-connector-c++-8.0.15-fix-build.patch 10052 BLAKE2B 11c37dcfaf64783bddb05f15a4a31a41123904bbdc39d7bff3f314f30c5e6fb56bf4890fd6aefc824bee2b39e9c8ac28f42c96d4a752695109ff9a1fd0176773 SHA512 fdc38272ff584d7ec3cfb2b014693102654b59f4864b68866455fdfaca171d1e4cbe800a06d2dd2c5975d47cb8d88211219c8201fbd571177c8c35c5e9055840 -AUX mysql-connector-c++-8.0.18-fix-build.patch 8968 BLAKE2B 1a738d7ca5e291e5dc17ddcf0f316e0b4588a0e01a4b3fe2b4961e7d082aca6a61870c43f4821a69aca1bfc5ae5777b837440d5863fd6a45d190b425adde20e4 SHA512 ef226d90d2d968e4e7aed3852c8ae8e608b383adbdc81818d1ca8ea1646b5d034db2fa8fb62ab6ffa3095362d326d2a11519782d5541965bacea3ecddb475a2b -DIST mysql-connector-c++-1.1.11.tar.gz 504872 BLAKE2B 16a265ce291d18d3e76f6654b42271d8c6cc9329f047d9eb0c6cdfaea37e1c13f04932e595e4333882b26154f0940949bc9bdab9d8af8e25d2bfff43be0030fa SHA512 d6839ecda12d1f088f24b20c08f3e9a757e9907d3375dba39e0f247b6a11de59817739644201e74d782d4c900aa18bf60910fe60a9ee98a2c0138104fb55dc22 +AUX mysql-connector-c++-8.0.19-fix-build.patch 9695 BLAKE2B c3334f74160a9b1148a588c7190db6f3a79fe70530d921428b7d86ec02f01324cf02c4130cd8d0cf42ecc4ccaccbecf90ffe0ac1cf8b265ea5cd9dea1046f30f SHA512 3d726b70a270e56ab38e8cebe5eb0186c4d0293dbd72844914ca9ef20674f20bc0fb4d2f0c449da77e4e6a81cc3ae454447a7983468d386e73f946dccd4a20cc +AUX mysql-connector-c++-8.0.19-fix-libressl-support.patch 3358 BLAKE2B 795c9f313d2495c3fee01066c7116fa3272a162b7401359657256d1adfb24d236049bbad6016e763de2a62ec9b6ccc93546eccffc457ae0bafca29b2c7e21b5d SHA512 d7b4b1424a6fd237ad0e7bd5648b156f770e352ec8fb3edfa6dfb767ebbe73e8ebc186b327e8543aa7bc12b7bc6081fae225a6ff0e153e25bb76900142adaa31 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4 -DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1 SHA512 ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646 -DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931 SHA512 9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14 -DIST mysql-connector-c++-8.0.18-src.tar.gz 3115736 BLAKE2B f28229593d20f4a401a3e9d0e636ee896a90fb7573f06d9b60340540d6c4d577b4f44daa287c7896a03a60d75dec343413cba981e63a22607ce60eb20f4de122 SHA512 f5b202677392bcf5c5bdd4c3433332e57aa20c1a140de81b57ce3ce69709661d572e2466ae022926fc220b20159c90f09f15b5e44f384529103a24fd592de60d -EBUILD mysql-connector-c++-1.1.11-r1.ebuild 1621 BLAKE2B fdf824ec8993976294bbc03467c63da10206bd04ed066ec33a2d7ce9310e654a0cdd1440e57517bcb22c37851310da0fb2e8e8c48696a99800da3e45cdc0c47a SHA512 7c05b18bac4af342c9feab9622e63afc916bd408a8f2b88dcf59c6192b5a62fba481b3e3f5cbca6826f61d092e7c91e9ef8f20f29b7272c11454c28a836fb15c +DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0 SHA512 5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1edecccc75da15d7bb0bd EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1642 BLAKE2B 6e6fa755a9c7f51fc9ddd4310664b7f1a9dfa1e348ea033006195ae9ef7d1f6cbbfa82c13394ea3355fb15bca3d05baa5bee43a287b7c63d9fcbe5240d0a59ab SHA512 0a0d2ec5bd5231f708baa1d605c8d24118d2bf3ca8583d5f22e3b9cbdcbd55c6a2fc3f5aa53bc3e4858884d5f7ad4d70221dbe57d2dc60df68cc3c27fceb16d4 -EBUILD mysql-connector-c++-1.1.9-r1.ebuild 1570 BLAKE2B 2f5d17177fe53a0ab0a70efe13d225a6982746819191719d1378b072881037ce81b0d63beb1e0e3dd9106dc04d17ef29b6ac010831734fca2f184901568ba2b2 SHA512 ce9598a2a5f8924cb24822dec8b5349f1655148ba7aba234e324912999d7a5df054a3b3d78c7e9c33c909d046d28bceb9322dc1848370fbed00b27941d49d387 -EBUILD mysql-connector-c++-8.0.15.ebuild 909 BLAKE2B 3a0fa261424e3ce299cf1d10ff5ace8e8bedc4e91fd0eb098916ca1b2d2353562a21d4aaf3fb73c119a665ad64da113036fba6ad9a02a6199306cece67b1f835 SHA512 32c8692e66ed3805c3e01ad5b4e66b04bc0a750e1fd270fc52f70777242abd21d5f11acdff27210b9194190e2ea1bfb3d203e264986c985f0d13210618e51047 -EBUILD mysql-connector-c++-8.0.18.ebuild 1015 BLAKE2B e14bf0abe5da065ff96a350c16ce5e90bd8f2190665d0fc45d29a3c6cfe447987733a9b10bb42671cc6c9ccdef485070a3ab265880b256739958cd46a4f7b186 SHA512 3b53b586627adeb2567d275a1a7f8f1787dc9d01d996015bf273e2fed9b387666793eba0add85961fc1eae2c011d8ce11b359f400217154a2029ea67c2783de1 +EBUILD mysql-connector-c++-8.0.19.ebuild 1070 BLAKE2B 1a42cb615fb70dccb3be62cbb4430770220534fe8bad1a69d828ec1342e0fb5c003034130320d0e7838416b1a1fb12063b3f0953a8af45c95698a968bbf5a45a SHA512 81ed1cc863ee4f5a8b30fffbceb2821f9fd59379c7ac6b382392526670649f3fe858fa54191fb7304db6a4611632752c09fecb5f4c5b5f58df3145836a5a4cbc MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch deleted file mode 100644 index 4b8a4a983096..000000000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.mysql.com/bug.php?id=90727 - ---- a/FindMySQL.cmake -+++ b/FindMySQL.cmake -@@ -700,8 +700,10 @@ endif() - - # For dynamic linking use the built-in sys and strings - if(NOT MYSQLCLIENT_STATIC_LINKING) -+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") - list(APPEND SYS_LIBRARIES "mysql_sys") - list(APPEND SYS_LIBRARIES "mysql_strings") -+endif() - list(APPEND SYS_LIBRARIES ${MYSQL_LIBRARIES}) - SET(MYSQL_LIBRARIES ${SYS_LIBRARIES}) - diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch deleted file mode 100644 index 35ed218e18dc..000000000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp ---- a/driver/mysql_connection.cpp 2016-12-14 04:58:54.000000000 -0500 -+++ b/driver/mysql_connection.cpp 2017-01-26 16:33:58.086005627 -0500 -@@ -1023,6 +1023,7 @@ - proxy->get_character_set_info(&cs); - *(static_cast<int *>(optionValue)) = cs.mbmaxlen; - /* mysql_get_option() was added in mysql 5.7.3 version */ -+#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) - } else if ( proxy->get_server_version() >= 50703 ) { - try { - if (GET_CONN_OPTION(optionName, optionValue, intOptions)) { -@@ -1036,6 +1037,7 @@ - CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str()); - throw e; - } -+#endif - } - } - /* }}} */ -@@ -1053,11 +1055,13 @@ - MY_CHARSET_INFO cs; - proxy->get_character_set_info(&cs); - return cs.dir ? sql::SQLString(cs.dir) : ""; -+#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) - } else if ( proxy->get_server_version() >= 50703 ) { - const char* optionValue= NULL; - if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) { - return optionValue ? sql::SQLString(optionValue) : ""; - } -+#endif - } - return ""; - } -diff -aurN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp ---- a/driver/nativeapi/libmysql_static_proxy.cpp 2017-01-26 16:35:46.256038741 -0500 -+++ b/driver/nativeapi/libmysql_static_proxy.cpp 2017-01-26 16:28:34.114915809 -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 ) && !defined ( MARIADB_VERSION_ID ) - if (::mysql_get_option(mysql, option, arg)) { - throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); - } else { diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.15-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.15-fix-build.patch deleted file mode 100644 index 4e3996914109..000000000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.15-fix-build.patch +++ /dev/null @@ -1,307 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -666,7 +666,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 -@@ -737,6 +737,12 @@ TARGET_LINK_LIBRARIES(try connector) - SET_INTERFACE_OPTIONS(try devapi) - # ADD_GCOV(try) - -+IF(WITH_SSL STREQUAL "system") -+ find_package(OpenSSL REQUIRED) -+ TARGET_LINK_LIBRARIES(try ${OPENSSL_LIBRARIES}) -+ENDIF() -+ -+ - if(WITH_JDBC) - - add_executable(try_jdbc EXCLUDE_FROM_ALL try_jdbc.cc) ---- a/cdk/cmake/install_macros.cmake -+++ b/cdk/cmake/install_macros.cmake -@@ -327,7 +327,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target) - DESTINATION ${ARG_DESTINATION} - ${RENAME_PARAM} - ${PERMISSIONS_${target_type}} -- CONFIGURATIONS Release RelWithDebInfo -+ CONFIGURATIONS Release RelWithDebInfo Gentoo - COMPONENT ${ARG_COMPONENT} - OPTIONAL) - -@@ -346,7 +346,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target) - INSTALL(FILES ${debug_pdb_target_location} - DESTINATION ${ARG_PDB_DESTINATION} - ${PDB_RENAME_PARAM} -- CONFIGURATIONS Release RelWithDebInfo -+ CONFIGURATIONS Release RelWithDebInfo Gentoo - COMPONENT ${ARG_COMPONENT} - OPTIONAL) - ENDIF() ---- a/cdk/cmake/libutils.cmake -+++ b/cdk/cmake/libutils.cmake -@@ -282,14 +282,7 @@ function(add_library_ex TARGET) - endforeach() - - if(libs) -- -- if(${type} STREQUAL "STATIC") -- merge_static_libraries(${TARGET} ${libs}) -- add_dependencies(${TARGET} ${libs}) -- else() - target_link_libraries(${TARGET} PRIVATE ${libs}) -- endif() -- - endif() - - # ---- a/cdk/cmake/protobuf.cmake -+++ b/cdk/cmake/protobuf.cmake -@@ -26,201 +26,8 @@ - # along with this program; if not, write to the Free Software Foundation, Inc., - # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - --# --# Usage: --# --# INCLUDE(protobuf) --# [USE_FULL_PROTOBUF()] --# --# MYSQLX_PROTOBUF_GENERATE_CPP(SRCS HDRS <protobuf definitions>) --# ADD_LIBRARY(target ... ${SRCS}) --# -- --if(DEFINED WITH_PROTOBUF) -- -- # -- # If WITH_PROTOBUF is defined, it should point at external location where -- # protobuf libraries were built using our CMakeLists.txt (so that -- # exports.cmake was produced). -- # -- -- if (NOT EXISTS "${WITH_PROTOBUF}/exports.cmake") -- message(FATAL_ERROR -- "Valid protobuf build not found at the given location" -- " (could not find exports.cmake): ${WITH_PROTOBUF}" -- ) -- endif() -- -- message("Using protobuf build at: ${WITH_PROTOBUF}") -- --else(DEFINED WITH_PROTOBUF) -- -- # -- # If external WITH_PROTOBUF location is not given, then we arrange for -- # building of protbuf from bundled sources in ${PROJECT_BINARY_DIR}/protobuf. -- # -- -- message("Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}") -- file(REMOVE "${PROJECT_BINARY_DIR}/protobuf/CMakeCache.txt") -- file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/protobuf") -- -- # -- # Pick build configuration for the protobuf build. Normally we build using the -- # same build configuration that is used for building CDK (Release/Debug/etc.). -- # But we also support building CDK under non-standard build configuration -- # named 'Static' (this is a dirty trick we use to simplify building our MSIs). -- # Since protobuf does not know 'Static' build configuration, we build protobuf -- # under 'Release' configuration in that case. -- # -- # We need to handle two cases. For some build systems, like Makefiles, -- # the build configuration is specified at cmake time using CMAKE_BUILD_TYPE -- # variable. In that case we also set it during protobuf build configuration. -- # Another case is a multi-configuration build system like MSVC. In this case -- # we use generator expression to pick correct configuration when the build -- # command is invoked below. -- # -- -- if(CMAKE_BUILD_TYPE) -- if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]") -- set(set_build_type -DCMAKE_BUILD_TYPE=Release) -- else() -- set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) -- endif() -- endif() -- -- set(CONFIG_EXPR -- $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>> -- ) -- -- execute_process( -- COMMAND ${CMAKE_COMMAND} -- -G "${CMAKE_GENERATOR}" -- ${set_build_type} -- -DSTATIC_MSVCRT=${STATIC_MSVCRT} -- -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} -- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -- -DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL} -- -DCMAKE_STATIC_LINKER_FLAGS=${CMAKE_STATIC_LINKER_FLAGS} -- ${PROJECT_SOURCE_DIR}/protobuf -- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf -- RESULT_VARIABLE protobuf_config -- ) -- -- if(protobuf_config) -- message(FATAL_ERROR "Could not configure Protobuf build: ${protobuf_config}") -- endif() -- -- set(WITH_PROTOBUF "${PROJECT_BINARY_DIR}/protobuf") -- --endif(DEFINED WITH_PROTOBUF) -- --# Import targets exported by protobuf -- --include(${WITH_PROTOBUF}/exports.cmake) -- --# --# Protobuf library targets imported above (pb_protobuf --# and pb_protobuf-lite) are local to the directory from which --# they were imported. This is not good if cdk is used as --# a sub-project of a parent project, because the parent project --# must have access to these targets. --# --# For that reason below we create global protobuf/protobuf-lite targets --# and copy their locations from the imported targets. --# --# Note: we can't use ALIAS library because it does not work with imported --# targets --# -- --add_library(protobuf STATIC IMPORTED GLOBAL) --add_library(protobuf-lite STATIC IMPORTED GLOBAL) -- --foreach(lib protobuf protobuf-lite) -- #message("processing: ${lib}") -- -- foreach(CONF NOCONFIG DEBUG RELEASE MINSIZEREL RELWITHDEBINFO) -- #message("- CONF: ${CONF}") -- -- get_target_property(LOC pb_${lib} IMPORTED_LOCATION_${CONF}) -- if(LOC) -- #message("- setting imported location to: ${LOC}") -- set_target_properties(${lib} PROPERTIES -- IMPORTED_LOCATION_${CONF} "${LOC}" -- ) -- set_property(TARGET ${lib} APPEND PROPERTY -- IMPORTED_CONFIGURATIONS ${CONF} -- ) -- endif() -- -- endforeach(CONF) -- --endforeach(lib) -- --# --# To support 'Static' build configuration the targets imported from the --# Protobuf project need to have IMPORTED_LOCATION_STATIC defined. We use --# 'Release' locations as Protobuf is built using 'Release' configuration in --# that case. --# -- --foreach(tgt protobuf protobuf-lite pb_protoc) -- -- get_target_property(LOC ${tgt} IMPORTED_LOCATION_RELEASE) -- set_property(TARGET ${tgt} PROPERTY IMPORTED_LOCATION_STATIC ${LOC}) -- --endforeach(tgt) -- -- --# protobuf depends on protobuf-lite -- --set_target_properties(protobuf PROPERTIES -- INTERFACE_LINK_LIBRARIES "protobuf-lite" --) -- -- --message("Protobuf include path: ${PROTOBUF_INCLUDE_DIR}") -- --set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR} -- CACHE INTERNAL "Protobuf include path" FORCE) --set(PROTOBUF_PROTOC_EXECUTABLE pb_protoc -- CACHE INTERNAL "Protobuf compiler" FORCE) -- --# --# Custom target build_protobuf ensures that Protobuf project is built. --# --# Note: this depends on Protobuf project generating the stamp file --# -- --if(NOT DEFINED PROTOBUF_BUILD_STAMP) -- message(FATAL_ERROR "Protobuf build stamp file not defined") --endif() -- -- --if(CMAKE_VERSION VERSION_LESS 3.0) -- add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP} -- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIGURATION> -- WORKING_DIRECTORY ${WITH_PROTOBUF} -- COMMENT "Building protobuf using configuration: $(Configuration)" -- ) --else() -- add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP} -- COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG_EXPR} -- WORKING_DIRECTORY ${WITH_PROTOBUF} -- COMMENT "Building protobuf using configuration: $(Configuration)" -- ) --endif() -- --add_custom_target(build_protobuf -- DEPENDS ${PROTOBUF_BUILD_STAMP} --) -- --add_dependencies(protobuf build_protobuf) --add_dependencies(protobuf-lite build_protobuf) --add_dependencies(pb_protoc build_protobuf) -+#SET(Protobuf_USE_STATIC_LIBS ON) -+find_package(Protobuf REQUIRED) - - # - # Choice between full and lite version of the library. ---- a/cdk/protocol/mysqlx/crud.cc -+++ b/cdk/protocol/mysqlx/crud.cc -@@ -295,7 +295,7 @@ public: - class Placeholder_conv_imp - : public Args_conv - { -- map<string, unsigned> m_map; -+ std::map<string, unsigned> m_map; - - public: - -@@ -303,7 +303,7 @@ public: - - unsigned conv_placeholder(const string &name) - { -- map<string, unsigned>::const_iterator it = m_map.find(name); -+ std::map<string, unsigned>::const_iterator it = m_map.find(name); - if (it == m_map.end()) - throw_error("Placeholder converter: Placeholder was not defined on args"); - //throw Generic_error((boost::format("Placeholder %s was not defined on args.") -@@ -314,7 +314,7 @@ public: - - void add_placeholder(const string &name) - { -- map<string, unsigned>::const_iterator it = m_map.find(name); -+ std::map<string, unsigned>::const_iterator it = m_map.find(name); - if (it != m_map.end()) - throw_error("Placeholder converter: Redefined placeholder"); - //throw Generic_error((boost::format("Redifined placeholder %s.") ---- a/jdbc.cmake -+++ b/jdbc.cmake -@@ -66,7 +66,7 @@ if(MYSQL_CONFIG_EXECUTABLE) - list(APPEND jdbc_cmake_opts -DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE}) - endif() - --list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON) -+list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=OFF) - - if(CMAKE_BUILD_TYPE) - if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]") diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.18-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch index 484220442ab8..b8976199afc5 100644 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.18-fix-build.patch +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -463,7 +463,7 @@ set_target_properties(connector PROPERTIES +@@ -475,7 +475,7 @@ set_target_properties(connector PROPERTIES install(TARGETS connector @@ -11,7 +11,7 @@ LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll --- a/cdk/cmake/DepFindProtobuf.cmake +++ b/cdk/cmake/DepFindProtobuf.cmake -@@ -48,197 +48,7 @@ if(TARGET Protobuf::pb) +@@ -48,229 +48,7 @@ if(TARGET Protobuf::pb) return() endif() @@ -52,10 +52,19 @@ - $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>> -) - +-set(set_arch) +-if(CMAKE_GENERATOR_PLATFORM) +- set(set_arch -A ${CMAKE_GENERATOR_PLATFORM}) +-endif() +- +-set(set_toolset) +-if(CMAKE_GENERATOR_TOOLSET) +- set(set_toolset -T ${CMAKE_GENERATOR_TOOLSET}) +-endif() - -if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake") - -- message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}") +- message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR} ${set_arch} ${set_toolset}") - - file(REMOVE "${PB_BINARY_DIR}/CMakeCache.txt") - file(MAKE_DIRECTORY "${PB_BINARY_DIR}") @@ -69,6 +78,8 @@ - execute_process( - COMMAND ${CMAKE_COMMAND} - -G "${CMAKE_GENERATOR}" +- ${set_arch} +- ${set_toolset} - ${set_build_type} - -DSTATIC_MSVCRT=${STATIC_MSVCRT} - -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} @@ -188,9 +199,27 @@ - ) -endif() - +-# +-# Try using parallel builds for protobuf. +-# +- +-include(ProcessorCount) +-ProcessorCount(N) +- +-MESSAGE("Processor Count: ${N}") +- +-set(opt_build) +-set(opt_tool) +-if(NOT N EQUAL 0) +- if(NOT CMAKE_VERSION VERSION_LESS 3.12) +- set(opt_build --parallel ${N}) +- elseif(CMAKE_MAKE_PROGRAM MATCHES "make") +- set(opt_tool -j${N}) +- endif() +-endif() - -add_custom_command(OUTPUT "${build_stamp}" -- COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG_EXPR} +- COMMAND ${CMAKE_COMMAND} --build . ${opt_build} --config ${CONFIG_EXPR} -- ${opt_tool} - COMMAND ${CMAKE_COMMAND} -E touch "${build_stamp}" - WORKING_DIRECTORY "${PB_BINARY_DIR}" - COMMENT "Building protobuf" @@ -200,17 +229,20 @@ - SOURCES "${build_stamp}" -) - +-set_target_properties(build_protobuf PROPERTIES FOLDER "Misc") +- -add_dependencies(Protobuf::pb-full build_protobuf) -add_dependencies(Protobuf::pb-lite build_protobuf) -add_dependencies(Protobuf::protoc build_protobuf) - -# TODO: Handle lite/full version - +- +find_package(Protobuf REQUIRED) - # Standard PROTOBUF_GENERATE_CPP modified to our usage -@@ -268,11 +78,11 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS) + +@@ -299,11 +77,11 @@ 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" @@ -238,7 +270,7 @@ add_coverage(cdk) --- a/cdk/protocol/mysqlx/CMakeLists.txt +++ b/cdk/protocol/mysqlx/CMakeLists.txt -@@ -125,11 +125,7 @@ target_include_directories(cdk_proto_mysqlx PRIVATE +@@ -126,11 +126,7 @@ target_include_directories(cdk_proto_mysqlx PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ) 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 new file mode 100644 index 000000000000..fc6eb777063e --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch @@ -0,0 +1,89 @@ +--- a/cdk/cmake/DepFindSSL.cmake ++++ b/cdk/cmake/DepFindSSL.cmake +@@ -88,7 +88,7 @@ function(main) + + set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "") + +- if(NOT OPENSSL_VERSION_MAJOR EQUAL 1) ++ if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1) + message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found") + else() + message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}") +@@ -182,42 +182,33 @@ function(find_openssl) + set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}" PARENT_SCOPE) + message("-- found OpenSSL headers at: ${OPENSSL_INCLUDE_DIR}") + +- + # Verify version number. Version information looks like: +- # #define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a 20 Nov 2018" +- ++ # #define OPENSSL_VERSION_NUMBER 0x1000103fL ++ # Encoded as MNNFFPPS: major minor fix patch status + FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" + OPENSSL_VERSION_NUMBER +- REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT" ++ REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" + ) +- +- #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}") + STRING(REGEX REPLACE +- "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]*)[\t ].*$" +- "\\1;\\2;\\3;\\4" +- version_list "${OPENSSL_VERSION_NUMBER}" ++ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" ++ OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}" ++ ) ++ STRING(REGEX REPLACE ++ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" ++ OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}" ++ ) ++ STRING(REGEX REPLACE ++ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" ++ OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}" + ) +- #message("-- OPENSSL_VERSION: ${version_list}") +- +- list(GET version_list 0 OPENSSL_VERSION_MAJOR) +- math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR}) +- +- list(GET version_list 1 OPENSSL_VERSION_MINOR) +- math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR}) +- +- list(GET version_list 2 OPENSSL_VERSION_FIX) +- math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX}) +- +- list(GET version_list 3 OPENSSL_VERSION_PATCH) +- +- + + set(OPENSSL_VERSION +- "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}" ++ "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}" + PARENT_SCOPE + ) + set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE) + ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) + + find_library(OPENSSL_LIBRARY + NAMES ssl ssleay32 ssleay32MD libssl +--- a/cdk/foundation/connection_openssl.cc ++++ b/cdk/foundation/connection_openssl.cc +@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err) + case SSL_ERROR_WANT_CONNECT: + case SSL_ERROR_WANT_ACCEPT: + case SSL_ERROR_WANT_X509_LOOKUP: +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + case SSL_ERROR_WANT_ASYNC: + case SSL_ERROR_WANT_ASYNC_JOB: + # endif +@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx) + + SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str()); + +-#if OPENSSL_VERSION_NUMBER>=0x1010100fL ++#if HAVE_TLS1_3_VERSION + + /* + Note: If TLSv1.3 is not enabled, there is no need to restrict diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild deleted file mode 100644 index 812af80237d4..000000000000 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake-utils flag-o-matic - -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}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86" -IUSE="debug examples gcov static-libs" - -DEPEND="dev-db/mysql-connector-c:= - dev-libs/boost:= - dev-libs/openssl:0= - !<dev-db/mysql-connector-c-6.1.8" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-fix-cmake.patch" - "${FILESDIR}/${PN}-1.1.11-fix-mariadb.patch" - "${FILESDIR}/${PN}-1.1.11-fix-cpp-linking.patch" -) - -src_configure() { - # native lib/wrapper needs this! - append-flags "-fno-strict-aliasing" - - local mycmakeargs=( - -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF - -DMYSQLCPPCONN_ICU_ENABLE=OFF - -DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF) - -DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF) - -DINSTALL_DOCS="/usr/share/doc/${PF}" - -DMYSQL_CXX_LINKAGE=0 - -DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # static lib has wrong name so we need to rename it - if use static-libs; then - mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \ - "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die - else - rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a - fi - - # examples - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins "${S}"/examples/* - fi -} diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild deleted file mode 100644 index 3f908d77fd3b..000000000000 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -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}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86" -IUSE="debug examples gcov static-libs" - -DEPEND="dev-db/mysql-connector-c:= - dev-libs/boost:= - dev-libs/openssl:0= - !<dev-db/mysql-connector-c-6.1.8" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-fix-cmake.patch" - "${FILESDIR}/${PN}-1.1.8-fix-mariadb.patch" -) - -src_configure() { - # native lib/wrapper needs this! - append-flags "-fno-strict-aliasing" - - local mycmakeargs=( - -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF - -DMYSQLCPPCONN_ICU_ENABLE=OFF - -DUSE_MYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF) - -DUSE_MYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF) - -DINSTALL_DOCS="/usr/share/doc/${PF}" - -DMYSQL_CXX_LINKAGE=0 - -DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # static lib has wrong name so we need to rename it - if use static-libs; then - mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \ - "${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die - else - rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a - fi - - # examples - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins "${S}"/examples/* - fi -} diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild deleted file mode 100644 index 2b7374017ca9..000000000000 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake-utils - -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" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="+legacy libressl" - -RDEPEND=" - dev-libs/protobuf:= - legacy? ( - dev-libs/boost:= - >=dev-db/mysql-connector-c-6.1.8:= - ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND}" -S="${WORKDIR}/${P}-src" - -PATCHES=( - "${FILESDIR}/${PN}-8.0.15-fix-build.patch" -) - -src_configure() { - local mycmakeargs=( - -DWITH_SSL=system - -DWITH_JDBC=$(usex legacy ON OFF) - ) - - cmake-utils_src_configure -} diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.18.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild index bc937af3de44..fb1898b6062c 100644 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.18.ebuild +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -28,7 +28,8 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${P}-src" PATCHES=( - "${FILESDIR}/${PN}-8.0.18-fix-build.patch" + "${FILESDIR}"/${PN}-8.0.19-fix-build.patch + "${FILESDIR}"/${PN}-8.0.19-fix-libressl-support.patch ) src_configure() { |