Attachment #225826 for bug #256618

Lines 20-27 COMMENT?= Multithreaded SQL database (server) Link Here

(-)b/databases/mariadb105-server/Makefile (-2 lines)
20	LICENSE= GPLv2	20	LICENSE= GPLv2
21	LICENSE_FILE= ${WRKSRC}/COPYING	21	LICENSE_FILE= ${WRKSRC}/COPYING
22		22
23	BROKEN_riscv64= fails to compile: needs FP_X_INV from empty sys/riscv/include/ieeefp.h
24
25	LIB_DEPENDS+= libpcre2-8.so:devel/pcre2	23	LIB_DEPENDS+= libpcre2-8.so:devel/pcre2
26		24
27	# Ugly workaround for MariaDB/CMake library detection	25	# Ugly workaround for MariaDB/CMake library detection




--- 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);

Return to bug 256618

Added Link Here

(-)b/databases/mariadb105-server/files/patch-sql_mysqld.cc (-1 / +20 lines)
0	-	1	--- sql/mysqld.cc.orig 2021-06-15 10:16:51 UTC
		2	+++ sql/mysqld.cc
		3	@@ -205,7 +205,7 @@ typedef fp_except fp_except_t;
		4
		5	inline void setup_fpu()
		6	{
		7	-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
		8	+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV)
		9	/* We can't handle floating point exceptions with threads, so disable
		10	this on freebsd
		11	Don't fall for overflow, underflow,divide-by-zero or loss of precision.
		12	@@ -218,7 +218,7 @@ inline void setup_fpu()
		13	fpsetmask(~(FP_X_INV \| FP_X_OFL \| FP_X_UFL \| FP_X_DZ \|
		14	FP_X_IMP));
		15	#endif /* FP_X_DNML */
		16	-#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
		17	+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */
		18
		19	#ifdef HAVE_FEDISABLEEXCEPT
		20	fedisableexcept(FE_ALL_EXCEPT);