testing/mariadb: disable tokudb to fix build on x86_64

toku requires backtrace() so we disable it for now.

we fix whitespace while at it

1 files changed, 35 insertions, 34 deletions

diff --git a/testing/mariadb/APKBUILD b/testing/mariadb/APKBUILD
index cf2d8b3e19a..07e5c530403 100644
--- a/testing/mariadb/APKBUILD
+++ b/testing/mariadb/APKBUILD
@@ -12,7 +12,8 @@ arch="all"
 license='GPL'
 depends=""
 depends_dev="openssl-dev zlib-dev"
-makedepends="cmake openssl-dev zlib-dev readline-dev libaio-dev ncurses-dev jemalloc-dev glib linux-headers libc-dev"
+makedepends="cmake openssl-dev zlib-dev readline-dev libaio-dev ncurses-dev
+	jemalloc-dev glib linux-headers libc-dev"
 source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
 $pkgname.initd
 fix-xtradb-storage.patch
@@ -37,51 +38,51 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DSYSCONFDIR=/etc/mysql \
 		-DMYSQL_DATADIR=/var/lib/mysql \
-    	-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
-    	-DDEFAULT_CHARSET=utf8 \
-    	-DDEFAULT_COLLATION=utf8_general_ci \
-    	-DENABLED_LOCAL_INFILE=ON \
-    	-DINSTALL_INFODIR=share/mysql/docs \
-    	-DINSTALL_MANDIR=share/man \
-    	-DINSTALL_PLUGINDIR=lib/mysql/plugin \
-    	-DINSTALL_SCRIPTDIR=bin \
-    	-DINSTALL_INCLUDEDIR=include/mysql \
-    	-DINSTALL_DOCREADMEDIR=share/mysql \
-    	-DINSTALL_SUPPORTFILESDIR=share/mysql \
-    	-DINSTALL_MYSQLSHAREDIR=share/mysql \
-    	-DINSTALL_DOCDIR=share/mysql/docs \
-    	-DINSTALL_SHAREDIR=share/mysql \
-    	-DWITH_READLINE=ON \
-    	-DWITH_ZLIB=system \
-    	-DWITH_SSL=system \
-    	-DWITH_LIBWRAP=OFF \
-    	-DWITH_EXTRA_CHARSETS=complex \
-    	-DWITH_EMBEDDED_SERVER=ON \
-    	-DWITH_ARCHIVE_STORAGE_ENGINE=1 \
-    	-DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
-    	-DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    	-DWITH_PARTITION_STORAGE_ENGINE=1 \
-    	-DWITH_TOKUDB_STORAGE_ENGINE=1 \
+	    	-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+	    	-DDEFAULT_CHARSET=utf8 \
+	    	-DDEFAULT_COLLATION=utf8_general_ci \
+	    	-DENABLED_LOCAL_INFILE=ON \
+	    	-DINSTALL_INFODIR=share/mysql/docs \
+	    	-DINSTALL_MANDIR=share/man \
+	    	-DINSTALL_PLUGINDIR=lib/mysql/plugin \
+	    	-DINSTALL_SCRIPTDIR=bin \
+	    	-DINSTALL_INCLUDEDIR=include/mysql \
+	    	-DINSTALL_DOCREADMEDIR=share/mysql \
+	    	-DINSTALL_SUPPORTFILESDIR=share/mysql \
+	    	-DINSTALL_MYSQLSHAREDIR=share/mysql \
+	    	-DINSTALL_DOCDIR=share/mysql/docs \
+	    	-DINSTALL_SHAREDIR=share/mysql \
+	    	-DWITH_READLINE=ON \
+	    	-DWITH_ZLIB=system \
+	    	-DWITH_SSL=system \
+	    	-DWITH_LIBWRAP=OFF \
+	    	-DWITH_EXTRA_CHARSETS=complex \
+	    	-DWITH_EMBEDDED_SERVER=ON \
+	    	-DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+	    	-DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+	    	-DWITH_INNOBASE_STORAGE_ENGINE=1 \
+	    	-DWITH_PARTITION_STORAGE_ENGINE=1 \
+	    	-DWITHOUT_TOKUDB_STORAGE_ENGINE=1 \
 		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    	-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-    	-DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+	    	-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+	    	-DWITHOUT_PBXT_STORAGE_ENGINE=1 \
 		|| return 1
-        make || return 1
+	make || return 1
 }
 
 package() {
-        cd "$_builddir"
-        make DESTDIR="$pkgdir/" install || return 1
+	cd "$_builddir"
+	make DESTDIR="$pkgdir/" install || return 1
 
-        install -Dm 755 "$startdir"/$pkgname.initd \
+	install -Dm 755 "$startdir"/$pkgname.initd \
 		"$pkgdir"/etc/init.d/$pkgname || return 1
 
 	# use small example config as default, which has tcp disabled
 	install -D  "$pkgdir"/usr/share/mysql/my-medium.cnf \
 		"$pkgdir"/etc/mysql/my.cnf || return 1
 
-        install -dDo mysql "$pkgdir"/var/log/mysql || return 1
-        install -dDo mysql "$pkgdir"/var/run/mysqld || return 1
+	install -dDo mysql "$pkgdir"/var/log/mysql || return 1
+	install -dDo mysql "$pkgdir"/var/run/mysqld || return 1
 
 	# libmysqlclient_r is no more.  Upstream tries to replace it with
 	# symlinks but that really doesn't work (wrong soname in particular).