From 7663a2c3f454d4ed7f1e378e8766a8aed71f3fed Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 21 Apr 2022 22:10:49 +0200 Subject: [PATCH] - valgrind: bump version to 3.18.1; update build --- .../patches/valgrind-fix-build-armv7-a.patch | 46 ------------------- .../patches/valgrind-fix-build-armv7ve.patch | 46 ------------------- package/valgrind/valgrind.mk | 28 ++++------- 3 files changed, 10 insertions(+), 110 deletions(-) delete mode 100644 package/valgrind/patches/valgrind-fix-build-armv7-a.patch delete mode 100644 package/valgrind/patches/valgrind-fix-build-armv7ve.patch diff --git a/package/valgrind/patches/valgrind-fix-build-armv7-a.patch b/package/valgrind/patches/valgrind-fix-build-armv7-a.patch deleted file mode 100644 index 18147750..00000000 --- a/package/valgrind/patches/valgrind-fix-build-armv7-a.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f0b4fd4d1c96b77cbf6c881b7d2d29882a05ab89 Mon Sep 17 00:00:00 2001 -Message-Id: -From: gixxpunk -Date: Fri, 27 Oct 2017 14:45:27 +0200 -Subject: [PATCH] - valgrind-fix-build-armv7-a - ---- - Makefile.all.am | 6 +++--- - configure.ac | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.all.am b/Makefile.all.am -index 1859a51..6ca4374 100644 ---- a/Makefile.all.am -+++ b/Makefile.all.am -@@ -199,11 +199,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g - - AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ - AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ -- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 -+ $(AM_CFLAGS_BASE) -mlittle-endian -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mhard-float - AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ -- -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE) -+ -mlittle-endian -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mhard-float $(AM_CFLAGS_PSO_BASE) - AM_CCASFLAGS_ARM_LINUX = @FLAG_M32@ \ -- -marm -mcpu=cortex-a8 -g -+ -mlittle-endian -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mhard-float -g - - AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ - AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) -diff --git a/configure.ac b/configure.ac -index 3874296..0fc12f7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -234,7 +234,7 @@ case "${host_cpu}" in - ARCH_MAX="s390x" - ;; - -- armv7*) -+ arm*) - AC_MSG_RESULT([ok (${host_cpu})]) - ARCH_MAX="arm" - ;; --- -2.15.0.rc2 - diff --git a/package/valgrind/patches/valgrind-fix-build-armv7ve.patch b/package/valgrind/patches/valgrind-fix-build-armv7ve.patch deleted file mode 100644 index a87f7102..00000000 --- a/package/valgrind/patches/valgrind-fix-build-armv7ve.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9901cac770d0d81ccf1ee8e5a02abf54d18e3a04 Mon Sep 17 00:00:00 2001 -Message-Id: <9901cac770d0d81ccf1ee8e5a02abf54d18e3a04.1509108606.git.thomas.harfmann@gmail.com> -From: gixxpunk -Date: Fri, 27 Oct 2017 14:50:01 +0200 -Subject: [PATCH] - valgrind-fix-build-armv7ve - ---- - Makefile.all.am | 6 +++--- - configure.ac | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.all.am b/Makefile.all.am -index 1859a51..648a197 100644 ---- a/Makefile.all.am -+++ b/Makefile.all.am -@@ -199,11 +199,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g - - AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ - AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ -- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 -+ $(AM_CFLAGS_BASE) -mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float - AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ -- -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE) -+ -mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float $(AM_CFLAGS_PSO_BASE) - AM_CCASFLAGS_ARM_LINUX = @FLAG_M32@ \ -- -marm -mcpu=cortex-a8 -g -+ -mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float -g - - AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ - AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) -diff --git a/configure.ac b/configure.ac -index 3874296..0fc12f7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -234,7 +234,7 @@ case "${host_cpu}" in - ARCH_MAX="s390x" - ;; - -- armv7*) -+ arm*) - AC_MSG_RESULT([ok (${host_cpu})]) - ARCH_MAX="arm" - ;; --- -2.15.0.rc2 - diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 120450c2..b3ac19de 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,31 +4,23 @@ # ################################################################################ -VALGRIND_VERSION = 3.13.0 +VALGRIND_VERSION = 3.18.1 VALGRIND_DIR = valgrind-$(VALGRIND_VERSION) VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_SITE = ftp://sourceware.org/pub/valgrind -$(DL_DIR)/$(VALGRIND_SOURCE): - $(download) $(VALGRIND_SITE)/$(VALGRIND_SOURCE) - -VALGRIND_PATCH = valgrind-fix-build-$(TARGET_CPU).patch - VALGRIND_AUTORECONF = YES VALGRIND_CONF_OPTS = \ --enable-only32bit \ --datadir=$(REMOVE_datadir) -valgrind: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PKG_DIR) - $(UNTAR)/$(PKG_SOURCE) - $(call APPLY_PATCHES,$(PKG_PATCH)) - $(CHDIR)/$(PKG_DIR); \ - $(CONFIGURE); \ - $(MAKE); \ - make install DESTDIR=$(TARGET_DIR) - $(TARGET_RM) $(addprefix $(TARGET_libdir)/valgrind/,*.a *.xml) - $(TARGET_RM) $(addprefix $(TARGET_bindir)/,cg_* callgrind_* ms_print) - $(REMOVE)/$(PKG_DIR) - $(TOUCH) +define VALGRIND_TARGET_CLEANUP + $(TARGET_RM) $(addprefix $(TARGET_libdir)/valgrind/,*.a) + $(TARGET_RM) $(addprefix $(TARGET_libexecdir)/valgrind/,*) + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,cg_* callgrind_* ms_print valgrind-* vgdb) +endef +VALGRIND_TARGET_FINALIZE_HOOKS += VALGRIND_TARGET_CLEANUP + +valgrind: | $(TARGET_DIR) + $(call autotools-package)