diff options
Diffstat (limited to 'dev-db/mysql')
| -rw-r--r-- | dev-db/mysql/Manifest | 6 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-8.0.19.ebuild (renamed from dev-db/mysql/mysql-8.0.18.ebuild) | 63 |
2 files changed, 36 insertions, 33 deletions
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 62204d424309..0b3957fda50f 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -8,13 +8,13 @@ DIST mysql-5.6.44.tar.gz 32531507 BLAKE2B 28fbf49f699eb9f43223ffa186671b119d1601 DIST mysql-5.6.45.tar.gz 32525559 BLAKE2B 3c629aed1de808acdea6654c7413e6851507c9c5be939ca4b4f5e2796da317e9b518a749bfc03d2b0ef05bd604b39f72e24b751076b9f206b462d21fa5db4f50 SHA512 f9d8bb72e96cc83f1064fe7df2e5fe8317ca9d44c4e776cf7827a61292fbcfccec716806c80d565958383d78fef93a19d61c726687b57680d5f93299291ff168 DIST mysql-boost-5.7.26.tar.gz 51098338 BLAKE2B 1263cd75814a7293b26b0f44fd2b7d20d983f3c6a62725df9515ecac2ef252f6644810cb4bf0d6f36b98e55317f1c67ea7541228cb38d896dfedc476a5755f26 SHA512 a5f9871dc5a8e5fffc1467c3dd542533a63fe553c029120475f8fd5530d884c76ab0c33ad260daf317faf318ccef01464f6ac2dc3468efceb6bf2b6c06c54cfd DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B 6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497 SHA512 573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52 -DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B e3622cccd8f60487a5e643e522e9cdc763d63ad2a5eda86a7a7db37f48a4e1288fea88ef7097c6c4b51bd5e8fd8ba26a5b8aea3501ae847180066e2d0aa2b5dc SHA512 180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5 +DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4 SHA512 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01 DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830 SHA512 c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8 -DIST mysql-extras-20191016-1722Z.tar.bz2 340442 BLAKE2B fa38fc455693b940cfb96f69a35c190f7edb3fdfa7bf0e3f4e444032843ca1ad1d4767fecaf3b080f7f8885335ffe81f2355e9fe0fdebe77ac90d7fb1a0d2121 SHA512 1b4d3fb1cda63471807e37ecdd6a663672149a9eac9497d6b864a9ecdd57d179950176da2db0668892567994bd2fc1e98ea499f16dc689738331a1e319c9131c +DIST mysql-extras-20200120-1919Z.tar.bz2 342474 BLAKE2B 9c75ec0cb05fc8f86d46bc9308f07c4105c3ab228ef94c0e9e2ab9b83d03362e4ef07c4dac866350ea012c03c111e7012e0b12270b30304a988b9b54bad74864 SHA512 2739c193e9595781b742af9fdb6e0f9c9a5fde87ca652c355d3f630c8c0b45b45967e5c8cf7635fb8615174775e34ae3270b149de7ba8a9d778979c2c66069ef EBUILD mysql-5.6.44-r1.ebuild 27146 BLAKE2B f8afe1efcdaf08bf6529f931486e1ad97aef88169a9ae301ebb25888c173f799cfced4c70569ff9aa565a71c15bf26e5129de8b2e4226e2b1fe6abfe7e010ba5 SHA512 dc5d3e62fe4f47126228594a0b1b79bf191f70c6158a33890e49d0826dadf890512a604968a57cdb4ee9ead4fd9c9c3c10eebea8603f3323bf01aa1b9a1d4608 EBUILD mysql-5.6.45-r2.ebuild 27096 BLAKE2B 4185eba92b1d3455b2c9d718249a55e0a95b45f02f25ae5d65a9c3e01ad5de9bfe66793e63a2f577e3e7a9e295f40d7576070b356f6e2efcf493599f8569817e SHA512 faed98d09a85757cf2cede77fc21d83e059fcee33cfffd739f2dabe34ec905101840244f45c4bdf97f945abd79202c78b40f3b1dcc2f9edf10173741a3ea5b13 EBUILD mysql-5.7.26-r1.ebuild 31733 BLAKE2B d6e6f240727daae94a5d08773f1ec5046831c9b7faa605bcf685aac69c1a23b046a0bfba942e36779d9cbdfb616c9b847a2547b25673af7dcefc8839c6752710 SHA512 6dfe6baf03cf35e006677b7879d4c60705d57dc759608f17ac34eb0c747aa99844f7efe69c8d660dfb9863353d0ef390230972153e5901e7b527b8e59d9b4084 EBUILD mysql-5.7.27-r1.ebuild 31759 BLAKE2B 865bf492634cb00a3a373497501beeda472b477219960f012dcd74d5951e218904390039c17e5ff999a562cc12cb6bd58f0e2b0aa6efdb2e29f203171f04cecc SHA512 c0c7393a70d3be0129cba16694437f3017e97aa5f6cf8db63eb460d62ba06f5d3af8edbcb472d009f560e29ab837038dce4306bf2c2eb94f9ce026cae2204678 -EBUILD mysql-8.0.18.ebuild 36490 BLAKE2B 684a8100b4ea47fea430b5abadded1a9ebfbb4fe147ec22c622a38d5f54d735c8c38620e36da25ac75c203b318d71cce346ec411c978454833031f5996ca4b4b SHA512 3b8a79e99a0e03c557684a840717a6b91c172a9a02642e6ab1ee8e701d9b9551460bc5cafa3bc32c06516e78c2e89b0b7b9c833187a4a8348ffe5ef0fae37d13 +EBUILD mysql-8.0.19.ebuild 36657 BLAKE2B 582e2845f196809ce1561c91c481d824af0d93ea969315ed9f0d89bfe4f21a80d69553d2714ff392bbde4c4ea44cd88581a82f96ab2def19147995c04a34620a SHA512 179a409bc1bad200a6a77a03997a1b576ee0a085637e360596f27d3364f4e795ff9a01bc784cce2450b54781f216f8a9f9971c2672bbdc7a5dbc2e07f22136e0 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7 diff --git a/dev-db/mysql/mysql-8.0.18.ebuild b/dev-db/mysql/mysql-8.0.19.ebuild index 6b067a6f004f..9d486bdb84a2 100644 --- a/dev-db/mysql/mysql-8.0.18.ebuild +++ b/dev-db/mysql/mysql-8.0.19.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -MY_EXTRAS_VER="20191016-1722Z" +MY_EXTRAS_VER="20200120-1919Z" CMAKE_MAKEFILE_GENERATOR=emake @@ -35,7 +35,13 @@ IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests RESTRICT="!test? ( test ) libressl? ( test )" -REQUIRED_USE="?? ( tcmalloc jemalloc )" +REQUIRED_USE="?? ( tcmalloc jemalloc ) + cjk? ( server ) + jemalloc? ( server ) + numa? ( server ) + profiling? ( server ) + router? ( server ) + tcmalloc? ( server )" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" @@ -57,36 +63,38 @@ PATCHES=( "${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-8.0.17.patch "${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-8.0.18.patch "${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch - "${MY_PATCH_DIR}"/20018_all_mysql-8.0.18-without-clientlibs-tools.patch - "${MY_PATCH_DIR}"/20018_all_mysql-8.0.17-add-protobuf-3.8+-support.patch - "${MY_PATCH_DIR}"/20018_all_mysql-8.0.18-fix-libressl-support.patch + "${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-without-clientlibs-tools.patch + "${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-fix-libressl-support.patch + "${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-fix-events_bugs-test.patch ) # Be warned, *DEPEND are version-dependant # These are used for both runtime and compiletime COMMON_DEPEND=" >=app-arch/lz4-0_p131:= - dev-libs/icu:= dev-libs/libedit - >=dev-libs/protobuf-3.8:= - dev-libs/libevent:= - net-libs/libtirpc:= >=sys-libs/zlib-1.2.3:0= - cjk? ( app-text/mecab:= ) - jemalloc? ( dev-libs/jemalloc:0= ) - kernel_linux? ( - dev-libs/libaio:0= - sys-process/procps:0= - ) libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) - numa? ( sys-process/numactl ) - tcmalloc? ( dev-util/google-perftools:0= ) + server? ( + dev-libs/icu:= + dev-libs/libevent:= + >=dev-libs/protobuf-3.8:= + net-libs/libtirpc:= + cjk? ( app-text/mecab:= ) + kernel_linux? ( + dev-libs/libaio:0= + sys-process/procps:0= + ) + numa? ( sys-process/numactl ) + jemalloc? ( dev-libs/jemalloc:0= ) + tcmalloc? ( dev-util/google-perftools:0= ) + ) " DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - net-libs/rpcsvc-proto virtual/yacc + server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON @@ -255,20 +263,9 @@ src_configure(){ mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES ) - # client/mysql.cc:1131:16: error: redefinition of ‘struct _hist_entry’ - mycmakeargs+=( - -DUSE_LIBEDIT_INTERFACE=0 - -DUSE_NEW_EDITLINE_INTERFACE=1 - -DHAVE_HIST_ENTRY=1 - ) - mycmakeargs+=( -DWITH_ICU=system - -DWITH_LIBEVENT=system -DWITH_LZ4=system - -DWITH_PROTOBUF=system - -DWITH_MECAB=$(usex cjk system OFF) - -DWITH_NUMA=$(usex numa ON OFF) # Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex -DWITH_RAPIDJSON=bundled ) @@ -299,6 +296,10 @@ src_configure(){ mycmakeargs+=( -DWITH_EXTRA_CHARSETS=all -DWITH_DEBUG=$(usex debug) + -DWITH_MECAB=$(usex cjk system OFF) + -DWITH_LIBEVENT=system + -DWITH_PROTOBUF=system + -DWITH_NUMA=$(usex numa ON OFF) ) if use profiling ; then @@ -404,6 +405,8 @@ src_test() { disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware") disabled_tests+=( "x.connection;0;Known failure - no upstream bug yet" ) disabled_tests+=( "main.mysqlpump_basic_lz4;0;Extra tool output causes false positive" ) + disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" ) + disabled_tests+=( "x.message_protobuf_nested;0;False positive caused by protobuff-3.11+" ) local test_ds for test_infos_str in "${disabled_tests[@]}" ; do |