commit: a2e8670db5426a804e89cc5606c6275c1d6ac51b Author: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail <DOT> com> AuthorDate: Mon Jun 2 18:36:10 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 2 21:31:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e8670d
dev-db/mariadb: fix building with gcc 16 Closes: https://bugs.gentoo.org/956632 Signed-off-by: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42402 Closes: https://github.com/gentoo/gentoo/pull/42402 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-db/mariadb/files/mariadb-11.4.7-gcc-16.patch | 40 ++++++++++++++++++++++++ dev-db/mariadb/mariadb-11.4.7.ebuild | 1 + 2 files changed, 41 insertions(+) diff --git a/dev-db/mariadb/files/mariadb-11.4.7-gcc-16.patch b/dev-db/mariadb/files/mariadb-11.4.7-gcc-16.patch new file mode 100644 index 000000000000..98a68544d657 --- /dev/null +++ b/dev-db/mariadb/files/mariadb-11.4.7-gcc-16.patch @@ -0,0 +1,40 @@ +https://github.com/MariaDB/server/pull/4081 + +From 63735967891430ec44761330a6800d548ba32b71 Mon Sep 17 00:00:00 2001 +From: Kostadin Shishmanov <[email protected]> +Date: Sun, 1 Jun 2025 17:35:07 +0300 +Subject: [PATCH] Fix building with gcc 16 (evex512 removal) + +Recently, evex512 was removed from gcc trunk [1] which will eventually +become gcc 16, and that leads to a build failure in +mariadb, originally reported downstream in a Gentoo bug [2]. + +This is reproducible across all versions from 10.6 to current master. + +The change is as simple as adding an upper boundary to which +gcc versions can use evex512. + +[1] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=c052a6f4 +[2] https://bugs.gentoo.org/956632 + +Signed-off-by: Kostadin Shishmanov <[email protected]> +--- + mysys/crc32/crc32c_x86.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mysys/crc32/crc32c_x86.cc b/mysys/crc32/crc32c_x86.cc +index fb5dc19f7a5..134596db2cc 100644 +--- a/mysys/crc32/crc32c_x86.cc ++++ b/mysys/crc32/crc32c_x86.cc +@@ -25,7 +25,7 @@ + #else + # include <cpuid.h> + # ifdef __APPLE__ /* AVX512 states are not enabled in XCR0 */ +-# elif __GNUC__ >= 14 || (defined __clang_major__ && __clang_major__ >= 18) ++# elif (__GNUC__ >= 14 && __GNUC__ < 16) || (defined __clang_major__ && __clang_major__ >= 18) + # define TARGET "pclmul,evex512,avx512f,avx512dq,avx512bw,avx512vl,vpclmulqdq" + # define USE_VPCLMULQDQ __attribute__((target(TARGET))) + # elif __GNUC__ >= 11 || (defined __clang_major__ && __clang_major__ >= 9) +-- +2.49.0 + diff --git a/dev-db/mariadb/mariadb-11.4.7.ebuild b/dev-db/mariadb/mariadb-11.4.7.ebuild index c33b6170a3b4..c6d712b5014b 100644 --- a/dev-db/mariadb/mariadb-11.4.7.ebuild +++ b/dev-db/mariadb/mariadb-11.4.7.ebuild @@ -211,6 +211,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}-11.4.7-gcc-16.patch eapply_user
