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

database/mariadb101-server: Various fixes

Browse Source 
- Fix table compression [1]
 - Fix GNUism [2]

PR:		239732 [1], 240692 [2]
Submitted by:	Mike Andrews <mandrews bit0 com> [3]
Reported by:	Tao Zhou <zhoutao laocius org> [1]
This commit is contained in:
Bernard Spil 2019-12-21 20:51:19 +00:00
parent 905b2b2174
commit 7360433f9f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=520581
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
databases/mariadb101-server/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME?= mariadb
PORTVERSION= 10.1.43
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirrors.supportex.net/${SITESDIR}/ \
@ -128,9 +128,11 @@ CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
CONNECT_EXTRA_USES= gnome
CONNECT_EXTRA_USE= gnome=libxml2
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO
LZ4_CMAKE_BOOL= GRN_WITH_LZ4 WITH_INNODB_LZ4
LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON
LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF
LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
LZO_CMAKE_BOOL= WITH_INNODB_LZO
LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON
LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF
LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2
MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h
MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4
@ -138,7 +140,8 @@ MROONGA_VARS= LICENSE+=LGPL20 LICENSE_COMB=multi
MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libJudy.so:devel/judy
SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY
SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON
SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF
SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
TOKUDB_IMPLIES= SNAPPY
TOKUDB_PORTDOCS= README.md

11
databases/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh Normal file
View File

@ -0,0 +1,11 @@
--- scripts/wsrep_sst_mariabackup.sh.orig 2019-12-11 19:29:57 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"