From 067e2f5f1d0102ffb96d3248e42a29e7352cc29c Mon Sep 17 00:00:00 2001
From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Thu, 28 Jun 2018 13:00:10 +0300
Subject: [PATCH] strace: fix build on aarch64

As of version 4.21, strace enforces mpers by default. The current
implementation of aarch64 compat in strace assumes it's identical to
ARMv7 EABI and therefore tries to enable m32 personality support. As
there is no -m32 support on aarch64, this causes the build to fail.

Restore previous strace behavior to fix build on aarch64.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Tested-by: Karl Palsson <karlp@tweak.net.au>
---
 package/devel/strace/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile
index 3704aa8b15..ded6d3bb84 100644
--- a/package/devel/strace/Makefile
+++ b/package/devel/strace/Makefile
@@ -30,6 +30,10 @@ include $(INCLUDE_DIR)/package.mk
 
 HOST_CFLAGS += -I$(LINUX_DIR)/user_headers/include
 
+ifeq ($(ARCH),aarch64)
+  CONFIGURE_ARGS += --enable-mpers=check
+endif
+
 CONFIGURE_VARS+= \
 	LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
 	CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \
-- 
2.30.2