From f0977c4ba54eaf7fb97c41220b48d801159c8a83 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 27 Jun 2018 02:17:34 -0500
Subject: system/strace: disable mpers properly

---
 system/strace/APKBUILD | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD
index 940259c0c..7ac11deaf 100644
--- a/system/strace/APKBUILD
+++ b/system/strace/APKBUILD
@@ -5,11 +5,11 @@ pkgrel=0
 pkgdesc="A useful diagnositic, instructional, and debugging tool"
 url="https://strace.io/"
 arch="all"
+options="!check"  # test suite requires mpers, which requires multilib
 license="BSD-3-Clause"
 depends=""
 makedepends="linux-headers autoconf automake"
 subpackages="$pkgname-doc"
-options="!checkroot"
 source="$pkgname-$pkgver.tar.gz::https://github.com/strace/$pkgname/archive/v$pkgver.tar.gz
 	disable-fortify.patch
 	fix-ppc-pt-regs-collision.patch
@@ -33,10 +33,6 @@ build() {
 		# for struct sigcontext.
 		export CFLAGS="$CFLAGS -D__SIGNAL_FRAMESIZE=160"
 		;;
-	ppc64* | x86_64 | aarch64)
-		# kill multilib support since it breaks everything
-		export st_cv_m32_mpers=no
-		;;
 	esac
 
 	./bootstrap
@@ -48,7 +44,8 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--disable-mpers
 	make
 }
 
-- 
cgit v1.2.3-70-g09d2