Skip to contentSkip to conversation

package/valgrind: bump to version 3.15.0

PATCH New Stefan Maksimovic 2 participants 2 messages Apr 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/valgrind: bump to version 3.15.0

Additionally, provide a patch with which valgrind
can be now compiled for MIPS32r6/MIPS64r6 and
reenable it in the config file.

Moreover, remove a patch which is not needed anymore since https://bugs.kde.org/show_bug.cgi?id=400975
has been resolved.

---
 ...e.ac-disable-gcc-march-mips64r2-detection.patch | 49 ----------------------
 ...x-mips32r6-and-mips64r6-compilation-issue.patch | 46 ++++++++++++++++++++
 package/valgrind/Config.in                         |  7 +---
 package/valgrind/valgrind.hash                     |  2 +-
 package/valgrind/valgrind.mk                       |  5 +--
 5 files changed, 49 insertions(+), 60 deletions(-)
 delete mode 100644 package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch
 create mode 100644 package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch
package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch deleted +0 -49
deleted file mode 100644
index a5573d5..0000000
@@ -1,49 +0,0 @@
-From 1fd5a3d2adf04bad6ae6e9eef9caead7d46d9307 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <[email protected]>
-Date: Thu, 8 Nov 2018 23:55:30 +0100
-Subject: [PATCH] configure.ac: disable gcc march mips64r2 detection
-
-Disable gcc march mips64r2 detection, compile flags already
-set by buildroot, fixes [1]:
-
-  error: '-mips64r2' conflicts with the other architecture options, which specify a mips64 processor
-
-[1] http://autobuild.buildroot.net/results/34f6e2352f1559f98c724fe5394db0035b42ddb1
-
-Signed-off-by: Peter Seiderer <[email protected]>
-[Thomas: remove code instead of commenting it]
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- configure.ac | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 289514ff1..18cf97ffe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1768,22 +1768,7 @@ case "${host_cpu}" in
-         AC_SUBST(FLAG_M32)
- 
- 
--        # does this compiler support -march=mips64r2 (mips64r2 default) ?
--        AC_MSG_CHECKING([if gcc accepts -march=mips64r2 -mabi=64])
--
--        safe_CFLAGS=$CFLAGS
--        CFLAGS="$CFLAGS -march=mips64r2 -mabi=64 -Werror"
--
--        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
--          return 0;
--        ]])], [
--        FLAG_M64="-march=mips64r2 -mabi=64"
--        AC_MSG_RESULT([yes])
--        ], [
-         FLAG_M64=""
--        AC_MSG_RESULT([no])
--        ])
--        CFLAGS=$safe_CFLAGS
- 
-         AC_SUBST(FLAG_M64)
-         ;;
--- 
-2.19.1
-
package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch new file +46 -0

46 lines not on this page · raw message

package/valgrind/Config.in +1 -6
index c09be86..56e4af2 100644
@@ -2,12 +2,7 @@ config BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS
 	bool
 	default y if BR2_aarch64
 	default y if BR2_ARM_CPU_ARMV7A
-	# MIPS32 R6 is unsupported
-	default y if BR2_mips && !BR2_mips_32r6
-	default y if BR2_mipsel && !BR2_mips_32r6
-	# MIPS64 R6 is unsupported
-	default y if BR2_mips64 && !BR2_mips_64r6
-	default y if BR2_mips64el && !BR2_mips_64r6
+	default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	default y if BR2_i386 || BR2_x86_64
 	default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
 	depends on !BR2_MIPS_SOFT_FLOAT
package/valgrind/valgrind.hash +1 -1
index 87fb496..3c7b98e 100644
@@ -1,5 +1,5 @@
 # From http://valgrind.org/downloads/current.html
-md5 74175426afa280184b62591b58c671b3 valgrind-3.14.0.tar.bz2
+md5 46e5fbdcbc3502a5976a317a0860a975 valgrind-3.15.0.tar.bz2
 
 # License files
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
package/valgrind/valgrind.mk +1 -4
index cae14f7..41b2625 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-VALGRIND_VERSION = 3.14.0
+VALGRIND_VERSION = 3.15.0
 VALGRIND_SITE = ftp://sourceware.org/pub/valgrind
 VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2
@@ -13,9 +13,6 @@ VALGRIND_CONF_OPTS = \
 	--disable-ubsan \
 	--without-mpicc
 VALGRIND_INSTALL_STAGING = YES
-# Patch 0003-configure.ac-disable-gcc-march-mips64r2-detection.patch
-# touches configure.ac
-VALGRIND_AUTORECONF = YES
 
 # Valgrind must be compiled with no stack protection, so forcefully
 # pass -fno-stack-protector to override what Buildroot may have in
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 package/valgrind: bump to version 3.15.0

Hello,

Quoted 9 lines · On Wed, 24 Apr 2019 14:47:07 +0200 Stefan Maksimovic…

Additionally, provide a patch with which valgrind
can be now compiled for MIPS32r6/MIPS64r6 and
reenable it in the config file.

Moreover, remove a patch which is not needed anymore since https://bugs.kde.org/show_bug.cgi?id=400975
has been resolved.

Quoted 9 lines
---
 ...e.ac-disable-gcc-march-mips64r2-detection.patch | 49 ----------------------
 ...x-mips32r6-and-mips64r6-compilation-issue.patch | 46 ++++++++++++++++++++
 package/valgrind/Config.in                         |  7 +---
 package/valgrind/valgrind.hash                     |  2 +-
 package/valgrind/valgrind.mk                       |  5 +--
 5 files changed, 49 insertions(+), 60 deletions(-)
 delete mode 100644 package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch
 create mode 100644 package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch

Applied to master, thanks. It would have been better to clearly indicate that the patch you are adding is backported from upstream. I've amended the commit log, and the patch description itself, with this information.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com