From eed6aa96891620da076ce78935527b1e779bad5b Mon Sep 17 00:00:00 2001
From: Joakim Bech <joakim.bech@linaro.org>
Date: Tue, 16 Jan 2018 10:02:23 +0100
Subject: [PATCH] strace: Disable multiple personality support
Multiple personality support in strace is not something that we make use
of in OP-TEE for the moment, so instead of putting more prerequisites on
our builds let us just disable this feature in strace.
Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
---
hikey.mk | 2 +-
hikey960.mk | 2 +-
qemu_v8.mk | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hikey.mk b/hikey.mk
index 7403482..5bd050d 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -249,7 +249,7 @@ strace:
cd $(STRACE_PATH); \
./bootstrap; \
set -e; \
- ./configure --host=$(MULTIARCH) CC="$(CCACHE)$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)gcc" LD=$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)ld; \
+ ./configure --host=$(MULTIARCH) --enable-mpers=no CC="$(CCACHE)$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)gcc" LD=$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)ld; \
CC="$(CCACHE)$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)gcc" LD=$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)ld $(MAKE) -C $(STRACE_PATH)
.PHONY: strace-clean
diff --git a/hikey960.mk b/hikey960.mk
index fd57aef..9b42525 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -239,7 +239,7 @@ strace:
cd $(STRACE_PATH); \
./bootstrap; \
set -e; \
- ./configure --host=$(MULTIARCH) CC="$(CCACHE)$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)gcc" LD=$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)ld; \
+ ./configure --host=$(MULTIARCH) --enable-mpers=no CC="$(CCACHE)$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)gcc" LD=$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)ld; \
CC="$(CCACHE)$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)gcc" LD=$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)ld $(MAKE) -C $(STRACE_PATH)
.PHONY: strace-clean
diff --git a/qemu_v8.mk b/qemu_v8.mk
index ea465bc..2477b84 100644
--- a/qemu_v8.mk
+++ b/qemu_v8.mk
@@ -186,7 +186,8 @@ strace:
ifneq ("$(wildcard $(STRACE_PATH))","")
cd $(STRACE_PATH) && \
./bootstrap && \
- ./configure --host=aarch64-linux-gnu CC=$(CROSS_COMPILE_NS_USER)gcc && \
+ ./configure --host=aarch64-linux-gnu CC=$(CROSS_COMPILE_NS_USER)gcc \
+ --enable-mpers=no && \
CC=$(CROSS_COMPILE_NS_USER)gcc $(MAKE)
endif
--
GitLab