Attachment #225825 for bug #256618

View | Details | Raw Unified | Return to bug 256618 | Differences between
Collapse All | Expand All





PORTNAME?=	mariadb
PORTVERSION=	10.4.19
PORTREVISION?=	1
CATEGORIES=	databases
MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

BROKEN_i386=	compile error: undeclared identifier 'my_atomic_add32'
BROKEN_riscv64=	fails to compile: needs FP_X_INV from empty sys/riscv/include/ieeefp.h

USES=		bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl

SUB_FILES=	pkg-message




--- sql/mysqld.cc.orig	2021-05-05 15:26:23 UTC
+++ sql/mysqld.cc
@@ -206,7 +206,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.
@@ -219,7 +219,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 && defined(FP_X_INV) */
 
 #ifdef HAVE_FEDISABLEEXCEPT
   fedisableexcept(FE_ALL_EXCEPT);
@@ -5033,8 +5033,9 @@ static void init_ssl()
       while ((err= ERR_get_error()))
         sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));
     }
- 

Return to bug 256618

Lines 2-8 Link Here

(-)b/databases/mariadb104-server/Makefile (-4 / +1 lines)
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 10.4.19	4	PORTVERSION= 10.4.19
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \	7	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
8	http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \	8	http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
Lines 20-28 COMMENT?= Multithreaded SQL database (server) Link Here
20	LICENSE= GPLv2	20	LICENSE= GPLv2
21	LICENSE_FILE= ${WRKSRC}/COPYING	21	LICENSE_FILE= ${WRKSRC}/COPYING
22		22
23	BROKEN_i386= compile error: undeclared identifier 'my_atomic_add32'
24	BROKEN_riscv64= fails to compile: needs FP_X_INV from empty sys/riscv/include/ieeefp.h
25
26	USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl	23	USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
27		24
28	SUB_FILES= pkg-message	25	SUB_FILES= pkg-message

Lines 1-6 Link Here

(-)b/databases/mariadb104-server/files/patch-sql_mysqld.cc (-3 / +20 lines)
1	--- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC	1	--- sql/mysqld.cc.orig 2021-05-05 15:26:23 UTC
2	+++ sql/mysqld.cc	2	+++ sql/mysqld.cc
3	@@ -4838,8 +4840,9 @@ static void init_ssl()	3	@@ -206,7 +206,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	@@ -219,7 +219,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 && defined(FP_X_INV) */
		18
		19	#ifdef HAVE_FEDISABLEEXCEPT
		20	fedisableexcept(FE_ALL_EXCEPT);
		21	@@ -5033,8 +5033,9 @@ static void init_ssl()
4	while ((err= ERR_get_error()))	22	while ((err= ERR_get_error()))
5	sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));	23	sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));
6	}	24	}
7	-