commit: 90b072cf17b8ac2f45434a430f029887683c4649 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jun 17 22:31:56 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 17 22:49:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b072cf
dev-db/mysql: fix build with GCC 12 Bug: https://bugs.gentoo.org/840990 Closes: https://bugs.gentoo.org/852737 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{mysql-8.0.27-gcc-12.patch => mysql-8.0.27-gcc12.patch} | 12 ++++++++++++ dev-db/mysql/mysql-8.0.27.ebuild | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dev-db/mysql/files/mysql-8.0.27-gcc-12.patch b/dev-db/mysql/files/mysql-8.0.27-gcc12.patch similarity index 59% rename from dev-db/mysql/files/mysql-8.0.27-gcc-12.patch rename to dev-db/mysql/files/mysql-8.0.27-gcc12.patch index fce8d5040c84..f4ecb59273a6 100644 --- a/dev-db/mysql/files/mysql-8.0.27-gcc-12.patch +++ b/dev-db/mysql/files/mysql-8.0.27-gcc12.patch @@ -1,4 +1,5 @@ https://bugs.gentoo.org/840990 +https://bugs.gentoo.org/852737 --- a/client/logger.cc +++ b/client/logger.cc @@ -27,6 +27,7 @@ @@ -19,3 +20,14 @@ https://bugs.gentoo.org/840990 #include <sstream> #include <m_string.h> + +--- a/router/src/harness/include/mysql/harness/net_ts/executor.h ++++ b/router/src/harness/include/mysql/harness/net_ts/executor.h +@@ -35,6 +35,7 @@ + #include <stdexcept> // logic_error + #include <thread> + #include <type_traits> // decay_t, enable_if ++#include <utility> + #include <unordered_map> + + #include "my_compiler.h" diff --git a/dev-db/mysql/mysql-8.0.27.ebuild b/dev-db/mysql/mysql-8.0.27.ebuild index 18c7bf808582..18dda6ee1678 100644 --- a/dev-db/mysql/mysql-8.0.27.ebuild +++ b/dev-db/mysql/mysql-8.0.27.ebuild @@ -170,7 +170,7 @@ src_unpack() { src_prepare() { eapply "${WORKDIR}"/mysql-patches - eapply "${FILESDIR}"/${PN}-8.0.27-gcc-12.patch + eapply "${FILESDIR}"/${PN}-8.0.27-gcc12.patch # Avoid rpm call which would trigger sandbox, #692368 sed -i \
