commit:     fae8773de0a78fd9b311c09d38ee0bea2a854630
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 13:50:55 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 13:51:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae8773d

dev-db/mariadb: fix build w/ gcc-13

Closes: https://bugs.gentoo.org/895698
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch | 23 +++++++++++++++++++++++
 dev-db/mariadb/mariadb-10.5.19-r1.ebuild          |  1 +
 2 files changed, 24 insertions(+)

diff --git a/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch 
b/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch
new file mode 100644
index 000000000000..c474028e7e06
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/895698
+https://github.com/MariaDB/server/commit/75bbf645a66db797be2abd3a348dce32eb753acc
+
+From 75bbf645a66db797be2abd3a348dce32eb753acc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.k...@gmail.com>
+Date: Tue, 24 Jan 2023 21:40:43 -0800
+Subject: [PATCH] Add missing include <cstdio>
+
+This is needed with GCC 13 and newer [1]
+
+[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
+
+Signed-off-by: Khem Raj <raj.k...@gmail.com>
+--- a/tpool/aio_linux.cc
++++ b/tpool/aio_linux.cc
+@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA 02111 - 1301 USA*/
+ #ifdef LINUX_NATIVE_AIO
+ # include <thread>
+ # include <atomic>
++# include <cstdio>
+ # include <libaio.h>
+ # include <sys/syscall.h>
+ 

diff --git a/dev-db/mariadb/mariadb-10.5.19-r1.ebuild 
b/dev-db/mariadb/mariadb-10.5.19-r1.ebuild
index 23642e369303..16de54792e38 100644
--- a/dev-db/mariadb/mariadb-10.5.19-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.19-r1.ebuild
@@ -213,6 +213,7 @@ src_prepare() {
        eapply "${WORKDIR}"/mariadb-patches
        eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
        eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch
+       eapply "${FILESDIR}"/${PN}-10.5.17-gcc-13.patch
 
        eapply_user
 

Reply via email to