From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 7 Oct 2024 21:28:20 +0000 (+0200)
Subject: valgrind: Fix build on ARMv7
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ffa4be4c14a76f0020929fadbcd7056f0d80f837;p=openwrt%2Fstaging%2Fansuel.git

valgrind: Fix build on ARMv7

The valgrind configure script checks if host_cpu is set to armv7 or arm.
By default --host is set to arm-openwrt-linux and the host_cpu variable
is set to arm. Then the valgrind build tries to compile valgrind for
armv6 and fails. Set it explicitly to armv7 to compile valgrind with
armv7 support.

Fixes: 1a55d90320c1 ("valgrind: Update to version 3.23")
Link: https://github.com/openwrt/openwrt/pull/16633
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/package/devel/valgrind/Makefile b/package/devel/valgrind/Makefile
index a8e47db7c8..f2fa400444 100644
--- a/package/devel/valgrind/Makefile
+++ b/package/devel/valgrind/Makefile
@@ -97,6 +97,10 @@ else
 	BITS := 32bit
 endif
 
+ifeq ($(CONFIG_arm_v7),y)
+	CONFIGURE_ARGS += --host=armv7-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))
+endif
+
 CONFIGURE_ARGS += \
 	--enable-lto \
 	--enable-tls \