[openwrt/openwrt] valgrind: Fix build on ARMv7

LEDE Commits lede-commits at lists.infradead.org
Tue Oct 8 13:24:04 PDT 2024


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/ffa4be4c14a76f0020929fadbcd7056f0d80f837

commit ffa4be4c14a76f0020929fadbcd7056f0d80f837
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Mon Oct 7 23:28:20 2024 +0200

    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 at hauke-m.de>
---
 package/devel/valgrind/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

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 \




More information about the lede-commits mailing list