cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/mariadb105-server: Update to 10.5.11

Browse Source 
* Fix build with RISC-V [1]

PR:		256618 [1]
Submitted by:	Robert Clausecker [1]
This commit is contained in:
Bernard Spil 2021-06-30 14:23:30 +00:00
parent f464c5731e
commit c930ca58dd
6 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
databases/mariadb105-client/Makefile
View File

@ -1,7 +1,6 @@
# Created by: Bernard Spil <brnrd@FreeBSD.org>
PORTNAME= mariadb
PORTREVISION= 1
PKGNAMESUFFIX= 105-client
COMMENT= Multithreaded SQL database (client)

4
databases/mariadb105-server/Makefile
View File

@ -1,7 +1,7 @@
# Created by: Bernard Spil <brnrd@FreeBSD.org>
PORTNAME?= mariadb
PORTVERSION= 10.5.10
PORTVERSION= 10.5.11
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
@ -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

6
databases/mariadb105-server/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1620475151
SHA256 (mariadb-10.5.10.tar.gz) = a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
SIZE (mariadb-10.5.10.tar.gz) = 99019617
TIMESTAMP = 1624477722
SHA256 (mariadb-10.5.11.tar.gz) = 761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a
SIZE (mariadb-10.5.11.tar.gz) = 99037098

20
databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh
View File

@ -1,11 +1,11 @@
--- scripts/wsrep_sst_mariabackup.sh.orig 2019-12-11 19:29:57 UTC
--- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-24 09:33:04 UTC
+++ scripts/wsrep_sst_mariabackup.sh
@@ -605,7 +605,7 @@ recv_joiner()
set +e
if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then
- if timeout --help | grep -q -- '-k';then
+ if timeout --help 2>&1 | grep -q -- '-k';then
ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
else
ltcmd="timeout -s9 $tmt $tcmd"
@@ -696,7 +696,7 @@ recv_joiner()
local ltcmd="$tcmd"
if [ $tmt -gt 0 ]; then
if [ -n "$(command -v timeout)" ]; then
- if timeout --help | grep -qw -- '-k'; then
+ if timeout --help 2>&1 | grep -qw -- '-k'; then
ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
else
ltcmd="timeout -s9 $tmt $tcmd"

18
databases/mariadb105-server/files/patch-scripts_wsrep__sst__rsync.sh
View File

@ -1,18 +0,0 @@
--- scripts/wsrep_sst_rsync.sh.orig 2020-05-09 19:28:00 UTC
+++ scripts/wsrep_sst_rsync.sh
@@ -390,7 +390,14 @@ EOF
elif [ "$WSREP_SST_OPT_ROLE" = "joiner" ]
then
- wsrep_check_programs lsof
+ case $OS in
+ FreeBSD)
+ wsrep_check_programs sockstat
+ ;;
+ *)
+ wsrep_check_programs lsof
+ ;;
+ esac
touch $SST_PROGRESS_FILE
MYSQLD_PID=$WSREP_SST_OPT_PARENT

20
databases/mariadb105-server/files/patch-sql_mysqld.cc Normal file
View File

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