From cd9523f0263a1aaffc614041d663f7e791849740 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 7 Jul 2019 00:26:57 +0000
Subject: user/mariadb: actually disable evil things instead of just talking
 about it

---
 user/mariadb/APKBUILD | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'user/mariadb')

diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD
index ddc4577a4..0b211f2ce 100644
--- a/user/mariadb/APKBUILD
+++ b/user/mariadb/APKBUILD
@@ -104,6 +104,12 @@ build() {
 		-DCONNECT_WITH_JDBC=NO \
 		-DCONNECT_WITH_LIBXML2=system "
 
+	# non-portable things, things that don't work on musl, BE, 32-bit etc
+	local _evil="\
+		-DPLUGIN_MROONGA=NO \
+		-DPLUGIN_ROCKSDB=NO \
+		-DPLUGIN_TOKUDB=NO "
+
 	local _system_libs="\
 		-DWITH_LIBARCHIVE=system \
 		-DWITH_PCRE=system \
@@ -112,12 +118,6 @@ build() {
 		-DWITH_EXTERNAL_ZLIB=YES \
 		-DCONC_WITH_EXTERNAL_ZLIB=YES "
 
-	# non-portable things, things that don't work on musl, BE, 32-bit etc
-	local _evil="\
-		-DPLUGIN_MROONGA=NO \
-		-DPLUGIN_ROCKSDB=NO \
-		-DPLUGIN_TOKUDB=NO "
-
 	local _system_paths="\
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DSYSCONFDIR=/etc/mysql \
@@ -144,6 +144,7 @@ build() {
 		${_plugins}\
 		${_innodb}\
 		${_connect}\
+		${_evil}\
 		${_system_libs}\
 		${_system_paths}\
 		${CMAKE_CROSSOPTS}" | tr -d '\t')
-- 
cgit v1.2.3-60-g2f50