From 786e32e39ee8f5b809e89d63133749608b0c5710 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 7 Jul 2019 00:16:42 +0000
Subject: user/mariadb: fix libedit, fix 32-bit PowerPC build

---
 user/mariadb/APKBUILD | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'user/mariadb/APKBUILD')

diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD
index 9c80ecff0..ddc4577a4 100644
--- a/user/mariadb/APKBUILD
+++ b/user/mariadb/APKBUILD
@@ -25,6 +25,10 @@ subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded
 	$pkgname-common::noarch $pkgname-backup mytop::noarch $pkgname-openrc
 	$pkgname-doc $pkgname-dev"
 source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
+	crc32-power.patch
+	gcc_builtins_ppc.h
+	libedit.patch
+	ppchax.patch
 	mariadb.initd
 	mariadb-server.limits
 	"
@@ -34,6 +38,12 @@ build() {
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
 
+	case "$CTARGET_ARCH" in
+		ppc)
+			cp "$srcdir"/gcc_builtins_ppc.h "$builddir"/include/atomic/gcc_builtins.h
+			;;
+	esac
+
 	local _release="\
 		-DBUILD_CONFIG=mysql_release \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -102,6 +112,12 @@ 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 \
@@ -132,7 +148,7 @@ build() {
 		${_system_paths}\
 		${CMAKE_CROSSOPTS}" | tr -d '\t')
 	echo "Build Flags are: $_buildflags"
-	eval "cmake $_buildflags"
+	eval "cmake $_buildflags ."
 	make
 }
 
@@ -246,5 +262,9 @@ doc() {
 }
 
 sha512sums="b04c47f72de2473d7b5edd04b4785a1d7179bb1f429f30ba53ae6cfbbb413200d9803eff1072949b2e81fd7d2164ea34c68620d621d4181b913daa2293ae140c  mariadb-10.4.6.tar.gz
+03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0  crc32-power.patch
+15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3  gcc_builtins_ppc.h
+41dc407cc16e7af5a8b9527489016a052a8bce85bd3d00f0d06b98b3fef16a693849d15a9a15136ee8148829fe4570d03df65dfb6fe9f0bccc447cab1bd666f4  libedit.patch
+0725c1c04ce01d6035d4fef5018709c8814228bf250503455c2aa7c972278fcb78b47e681a721cb42dc61508075e1485116d8c7ac924c584b4bf5ca6b27b6594  ppchax.patch
 1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654  mariadb.initd
 d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e  mariadb-server.limits"
-- 
cgit v1.2.3-70-g09d2