diff options
| author |   Sam James <sam@gentoo.org> | 2022-06-17 23:31:56 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-06-17 23:49:07 +0100 |
| commit | 90b072cf17b8ac2f45434a430f029887683c4649 (patch) | |
| tree | b63cf4cb1cafb4c686e2ea2041e4eebe908258d3 /dev-db | |
| parent | games-engines/odamex: fix build with GCC 12 (diff) | |
| download | gentoo-90b072cf17b8ac2f45434a430f029887683c4649.tar.gz gentoo-90b072cf17b8ac2f45434a430f029887683c4649.tar.bz2 gentoo-90b072cf17b8ac2f45434a430f029887683c4649.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql/files/mysql-8.0.27-gcc12.patch (renamed from dev-db/mysql/files/mysql-8.0.27-gcc-12.patch) | 12 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-8.0.27.ebuild | 2 |
2 files changed, 13 insertions, 1 deletions
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 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 \ |