Attachment 225826 Details for Bug 256618 – databases/mariadb105-server: patch and unbreak on riscv64

[patch] databases/mariadb105-server: patch and unbreak on riscv64

0003-mariadb105-server-patch-and-unbreak-on-riscv64.patch (text/plain), 2.30 KB, created by Robert Clausecker on 2021-06-15 11:51:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2021-06-15 11:51:55 UTC

Size: 2.30 KB

patch

obsolete

>From f7a29612da0d83082278b902b0f4e3b62cc258f7 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Tue, 15 Jun 2021 13:47:21 +0200
>Subject: [PATCH 3/3] mariadb105-server: patch and unbreak on riscv64
>
>RISC-V does not have FP exceptions and nobody has bothered to stub out
>the fpsetmask() calls.  Remove these calls on platforms that don't
>support them to unbreak the build.
>---
> databases/mariadb105-server/Makefile          |  2 --
> .../files/patch-sql_mysqld.cc                 | 20 +++++++++++++++++++
> 2 files changed, 20 insertions(+), 2 deletions(-)
> create mode 100644 databases/mariadb105-server/files/patch-sql_mysqld.cc
>
>diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
>index 79d61be57b65..1819b637511a 100644
>--- a/databases/mariadb105-server/Makefile
>+++ b/databases/mariadb105-server/Makefile
>@@ -20,8 +20,6 @@ COMMENT?=	Multithreaded SQL database (server)
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN_riscv64=	fails to compile: needs FP_X_INV from empty sys/riscv/include/ieeefp.h
>-
> LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
> 
> # Ugly workaround for MariaDB/CMake library detection
>diff --git a/databases/mariadb105-server/files/patch-sql_mysqld.cc b/databases/mariadb105-server/files/patch-sql_mysqld.cc
>new file mode 100644
>index 000000000000..e433bfc7d450
>--- /dev/null
>+++ b/databases/mariadb105-server/files/patch-sql_mysqld.cc
>@@ -0,0 +1,20 @@
>+--- sql/mysqld.cc.orig	2021-06-15 10:16:51 UTC
>++++ sql/mysqld.cc
>+@@ -205,7 +205,7 @@ typedef fp_except fp_except_t;
>+ 
>+ inline void setup_fpu()
>+ {
>+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
>++#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV)
>+   /* We can't handle floating point exceptions with threads, so disable
>+      this on freebsd
>+      Don't fall for overflow, underflow,divide-by-zero or loss of precision.
>+@@ -218,7 +218,7 @@ inline void setup_fpu()
>+   fpsetmask(~(FP_X_INV |             FP_X_OFL | FP_X_UFL | FP_X_DZ |
>+               FP_X_IMP));
>+ #endif /* FP_X_DNML */
>+-#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
>++#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */
>+ 
>+ #ifdef HAVE_FEDISABLEEXCEPT
>+   fedisableexcept(FE_ALL_EXCEPT);
>-- 
>2.31.1
>

Actions: View | Diff

Attachments on bug 256618: 225824 | 225825 | 225826 | 226110