Skip to contentSkip to conversation

valgrind: rename patches without version in the filename

PATCH New Thomas Petazzoni 2 participants 4 messages Dec 19, 2012 – Jan 1, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 valgrind: rename patches without version in the filename

---
 ...r-check.patch => valgrind-compiler-check.patch} |    0
 ...ch => valgrind-dont-include-a-out-header.patch} |    0
 ...ort.patch => valgrind-fix-ccache-support.patch} |    0
 ....0-largefile.patch => valgrind-largefile.patch} |    0
 ...ore-ioctls.patch => valgrind-more-ioctls.patch} |    0
 ...ch => valgrind-workaround-SIGSEGV-on-PPC.patch} |    0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename package/valgrind/{valgrind-3.7.0-compiler-check.patch => valgrind-compiler-check.patch} (100%)
 rename package/valgrind/{valgrind-3.7.0-dont-include-a-out-header.patch => valgrind-dont-include-a-out-header.patch} (100%)
 rename package/valgrind/{valgrind-3.7.0-fix-ccache-support.patch => valgrind-fix-ccache-support.patch} (100%)
 rename package/valgrind/{valgrind-3.7.0-largefile.patch => valgrind-largefile.patch} (100%)
 rename package/valgrind/{valgrind-3.7.0-more-ioctls.patch => valgrind-more-ioctls.patch} (100%)
 rename package/valgrind/{valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch => valgrind-workaround-SIGSEGV-on-PPC.patch} (100%)
package/valgrind/valgrind-compiler-check.patch renamed from package/valgrind/valgrind-3.7.0-compiler-check.patch +0 -0
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-compiler-check.patch
rename to package/valgrind/valgrind-compiler-check.patch
package/valgrind/valgrind-dont-include-a-out-header.patch renamed from package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch +0 -0
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch
rename to package/valgrind/valgrind-dont-include-a-out-header.patch
package/valgrind/valgrind-fix-ccache-support.patch renamed from package/valgrind/valgrind-3.7.0-fix-ccache-support.patch +0 -0
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-fix-ccache-support.patch
rename to package/valgrind/valgrind-fix-ccache-support.patch
package/valgrind/valgrind-largefile.patch renamed from package/valgrind/valgrind-3.7.0-largefile.patch +0 -0
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-largefile.patch
rename to package/valgrind/valgrind-largefile.patch
package/valgrind/valgrind-more-ioctls.patch renamed from package/valgrind/valgrind-3.7.0-more-ioctls.patch +0 -0
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-more-ioctls.patch
rename to package/valgrind/valgrind-more-ioctls.patch
package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch renamed from package/valgrind/valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch +0 -0
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch
rename to package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 2/2 valgrind: bump to 3.8.1

Status of the patches:

* valgrind-compiler-check.patch, no longer needed, merged upstream.

* valgrind-dont-include-a-out-header.patch, kept, just refreshed

* valgrind-fix-ccache-support.patch, adapted to the newer Valgrind release.

* valgrind-largefile.patch, kept, just refreshed

* valgrind-more-ioctls.patch, removed. Most of it was merged upstream. This patch was anyway a feature addition, so it shouldn't be kept in Buildroot.

* valgrind-workaround-SIGSEGV-on-PPC.patch, kept as is, just refreshed.

This bump also fixes the build failure we were experiencing with Valgrind 3.7.0 against recent Glibc versions.

---
 package/valgrind/valgrind-compiler-check.patch     |   76 --------
 .../valgrind-dont-include-a-out-header.patch       |    2 +-
 package/valgrind/valgrind-fix-ccache-support.patch |   54 +++---
 package/valgrind/valgrind-largefile.patch          |   20 +-
 package/valgrind/valgrind-more-ioctls.patch        |  203 --------------------
 .../valgrind-workaround-SIGSEGV-on-PPC.patch       |    6 +-
 package/valgrind/valgrind.mk                       |    2 +-
 7 files changed, 41 insertions(+), 322 deletions(-)
 delete mode 100644 package/valgrind/valgrind-compiler-check.patch
 delete mode 100644 package/valgrind/valgrind-more-ioctls.patch
package/valgrind/valgrind-compiler-check.patch deleted +0 -76
deleted file mode 100644
index 4a9fcba..0000000
@@ -1,76 +0,0 @@
-Fix the compiler version check so that it doesn't misdetect the
-version when the compiler version contains parenthesis.
-
-Taken from upstream r12274.
-
-Index: valgrind-3.7.0/configure.in
-===================================================================
---- valgrind-3.7.0.orig/configure.in	2011-12-22 15:21:22.269669307 +0100
-+++ valgrind-3.7.0/configure.in	2011-12-22 15:21:54.029135051 +0100
-@@ -98,18 +98,21 @@
- # We don't want gcc < 3.0
- AC_MSG_CHECKING([for a supported version of gcc])
- 
--# Try to get the gcc version, sed-ing out some unexpected stuff
--# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
--# Without this, the version number comes out as 686, 10 or 11 :-(
-+# Obtain the compiler version.
- # 
--# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
--# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# A few examples of how the ${CC} --version output looks like:
-+#
-+# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
-+# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
-+# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
-+# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
-+# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
-+# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# Clang: clang version 2.9 (tags/RELEASE_29/final)
- #
- [gcc_version=`${CC} --version \
--             | head -n 1 \
--             | $SED 's/i686-apple-darwin10//' \
--             | $SED 's/i686-apple-darwin11//' \
--             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
-+             | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
-+                       -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`]
- 
- is_clang="notclang"
- if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
-Index: valgrind-3.7.0/configure
-===================================================================
---- valgrind-3.7.0.orig/configure	2011-12-22 15:22:05.138948143 +0100
-+++ valgrind-3.7.0/configure	2011-12-22 15:23:34.807439246 +0100
-@@ -5122,18 +5122,22 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a supported version of gcc" >&5
- $as_echo_n "checking for a supported version of gcc... " >&6; }
- 
--# Try to get the gcc version, sed-ing out some unexpected stuff
--# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
--# Without this, the version number comes out as 686, 10 or 11 :-(
-+# Obtain the compiler version.
-+# 
-+# A few examples of how the ${CC} --version output looks like:
- #
--# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
--# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
-+# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
-+# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
-+# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
-+# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
-+# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# Clang: clang version 2.9 (tags/RELEASE_29/final)
- #
- gcc_version=`${CC} --version \
--             | head -n 1 \
--             | $SED 's/i686-apple-darwin10//' \
--             | $SED 's/i686-apple-darwin11//' \
--             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`
-+             | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
-+                       -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`
-+
- 
- is_clang="notclang"
- if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
package/valgrind/valgrind-dont-include-a-out-header.patch +1 -1
index ed1c939..2afd44a 100644
@@ -20,7 +20,7 @@ Index: b/coregrind/m_debuginfo/readstabs.c
 ===================================================================
 --- a/coregrind/m_debuginfo/readstabs.c
 +++ b/coregrind/m_debuginfo/readstabs.c
-@@ -52,7 +52,21 @@
+@@ -53,7 +53,21 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
  #if defined(VGO_linux)
package/valgrind/valgrind-fix-ccache-support.patch +26 -28

67 lines not on this page · raw message

package/valgrind/valgrind-largefile.patch +10 -10
index 53b6e6f..3a8a780 100644
@@ -6,10 +6,10 @@ is detected.
 
 Signed-off-by: Peter Korsgaard <[email protected]>
 
-Index: valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c
+Index: b/coregrind/m_initimg/initimg-linux.c
 ===================================================================
---- valgrind-3.7.0.orig/coregrind/m_initimg/initimg-linux.c	2011-10-26 23:24:43.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c	2011-12-22 14:53:12.798185055 +0100
+--- a/coregrind/m_initimg/initimg-linux.c
++++ b/coregrind/m_initimg/initimg-linux.c
 @@ -55,7 +55,11 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
@@ -22,11 +22,11 @@ Index: valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c
  /* This is for ELF types etc, and also the AT_ constants. */
  #include <elf.h>
  /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
-Index: valgrind-3.7.0/coregrind/m_main.c
+Index: b/coregrind/m_main.c
 ===================================================================
---- valgrind-3.7.0.orig/coregrind/m_main.c	2011-10-26 23:24:45.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_main.c	2011-12-22 14:53:12.798185055 +0100
-@@ -2743,7 +2743,11 @@
+--- a/coregrind/m_main.c
++++ b/coregrind/m_main.c
+@@ -2948,7 +2948,11 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
  #define _GNU_SOURCE
@@ -38,10 +38,10 @@ Index: valgrind-3.7.0/coregrind/m_main.c
  /* This is in order to get AT_NULL and AT_PAGESIZE. */
  #include <elf.h>
  /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
-Index: valgrind-3.7.0/coregrind/m_ume/elf.c
+Index: b/coregrind/m_ume/elf.c
 ===================================================================
---- valgrind-3.7.0.orig/coregrind/m_ume/elf.c	2011-10-26 23:24:41.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_ume/elf.c	2011-12-22 14:53:12.798185055 +0100
+--- a/coregrind/m_ume/elf.c
++++ b/coregrind/m_ume/elf.c
 @@ -48,7 +48,11 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
package/valgrind/valgrind-more-ioctls.patch deleted +0 -203

203 lines not on this page · raw message

package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch +3 -3
index ea91a00..3358c24 100644
@@ -8,10 +8,10 @@ Signed-off-by: Pierre Habouzit <[email protected]>
  coregrind/m_machine.c |    4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)
 
-Index: valgrind-3.7.0/coregrind/m_machine.c
+Index: b/coregrind/m_machine.c
 ===================================================================
---- valgrind-3.7.0.orig/coregrind/m_machine.c	2011-10-27 12:45:52.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_machine.c	2011-12-22 14:53:19.758067046 +0100
+--- a/coregrind/m_machine.c
++++ b/coregrind/m_machine.c
 @@ -27,6 +27,10 @@
     The GNU General Public License is contained in the file COPYING.
  */
package/valgrind/valgrind.mk +1 -1
index cdebbec..ff35e6c 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-VALGRIND_VERSION = 3.7.0
+VALGRIND_VERSION = 3.8.1
 VALGRIND_SITE    = http://valgrind.org/downloads/
 VALGRIND_SOURCE  = valgrind-$(VALGRIND_VERSION).tar.bz2
 VALGRIND_LICENSE = GPLv2 GFDLv1.2
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 1/2 valgrind: rename patches without version in the filename

In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Whichbbtw reminds me - We still need to update our patch naming handling as decided back at the fosdem dev days (point 7):

http://lists.busybox.net/pipermail/buildroot/2012-February/050371.html

I'll do so this week, hopefully it doesn't affect too many pending patches.

Signature · 1 line
Bye, Peter Korsgaard