Patchwork [10/14] valgrind: upgrade to 3.7.0

login
register
mail settings
Submitter Shane Wang
Date Dec. 23, 2011, 4:35 p.m.
Message ID <f4d948b417c0d1c7d7d7098ccd7a81278cea5328.1324657801.git.shane.wang@intel.com>
Download mbox | patch
Permalink /patch/17569/
State New
Headers show

Comments

Shane Wang - Dec. 23, 2011, 4:35 p.m.
Signed-off-by: Shane Wang <shane.wang@intel.com>
---
 .../valgrind/valgrind-3.7.0/configure-fix.patch    |   23 ++++++++++++++++++++
 .../fix_issue_caused_by_ccache.patch               |    0
 .../fix_unsupporting_kernel_3.patch                |    0
 .../fixed-perl-path.patch                          |    0
 .../{valgrind_3.6.1.bb => valgrind_3.7.0.bb}       |   13 ++++++-----
 5 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
 rename meta/recipes-devtools/valgrind/{valgrind-3.6.1 => valgrind-3.7.0}/fix_issue_caused_by_ccache.patch (100%)
 rename meta/recipes-devtools/valgrind/{valgrind-3.6.1 => valgrind-3.7.0}/fix_unsupporting_kernel_3.patch (100%)
 rename meta/recipes-devtools/valgrind/{valgrind-3.6.1 => valgrind-3.7.0}/fixed-perl-path.patch (100%)
 rename meta/recipes-devtools/valgrind/{valgrind_3.6.1.bb => valgrind_3.7.0.bb} (71%)
Koen Kooi - Dec. 23, 2011, 4:46 p.m.
Op 23 dec. 2011, om 17:35 heeft Shane Wang het volgende geschreven:

> Signed-off-by: Shane Wang <shane.wang@intel.com>
> ---
> .../valgrind/valgrind-3.7.0/configure-fix.patch    |   23 ++++++++++++++++++++
> .../fix_issue_caused_by_ccache.patch               |    0
> .../fix_unsupporting_kernel_3.patch                |    0
> .../fixed-perl-path.patch                          |    0
> .../{valgrind_3.6.1.bb => valgrind_3.7.0.bb}       |   13 ++++++-----
> 5 files changed, 30 insertions(+), 6 deletions(-)
> create mode 100644 meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
> rename meta/recipes-devtools/valgrind/{valgrind-3.6.1 => valgrind-3.7.0}/fix_issue_caused_by_ccache.patch (100%)
> rename meta/recipes-devtools/valgrind/{valgrind-3.6.1 => valgrind-3.7.0}/fix_unsupporting_kernel_3.patch (100%)
> rename meta/recipes-devtools/valgrind/{valgrind-3.6.1 => valgrind-3.7.0}/fixed-perl-path.patch (100%)
> rename meta/recipes-devtools/valgrind/{valgrind_3.6.1.bb => valgrind_3.7.0.bb} (71%)
> 
> diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
> new file mode 100644
> index 0000000..f57897c
> --- /dev/null
> +++ b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
> @@ -0,0 +1,23 @@
> +To recognize gcc version from poky in configure.in
> +
> +Upstream-Status: Inappropriate [configuration]
> +
> +Signed-off-by: Shane Wang <shane.wang@intel.com>
> +
> +diff -r 91a8df96084a configure.in
> +--- a/configure.in	Fri Dec 23 20:57:01 2011 +0800
> ++++ b/configure.in	Fri Dec 23 20:59:21 2011 +0800
> +@@ -104,11 +104,13 @@
> + # 
> + # 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)
> ++# i586-poky-linux-gcc (GCC) 4.6.3 (prerelease) Copyright
> + #
> + [gcc_version=`${CC} --version \
> +              | head -n 1 \
> +              | $SED 's/i686-apple-darwin10//' \
> +              | $SED 's/i686-apple-darwin11//' \
> ++             | $SED 's/.*poky[^0-9]*//' \

Either change this to work with every TARGET_VENDOR or put it in the poky layer as bbappend.
Shane Wang - Dec. 24, 2011, 8:11 a.m.
Koen Kooi wrote onĀ 2011-12-24:

> 
> Op 23 dec. 2011, om 17:35 heeft Shane Wang het volgende geschreven:
> 
>> Signed-off-by: Shane Wang <shane.wang@intel.com> ---
>> .../valgrind/valgrind-3.7.0/configure-fix.patch    |   23
>> ++++++++++++++++++++ .../fix_issue_caused_by_ccache.patch              
>> |    0 .../fix_unsupporting_kernel_3.patch                |    0
>> .../fixed-perl-path.patch                          |    0
>> .../{valgrind_3.6.1.bb => valgrind_3.7.0.bb}       |   13 ++++++----- 5
>> files changed, 30 insertions(+), 6 deletions(-) create mode 100644
>> meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
>> rename meta/recipes-devtools/valgrind/{valgrind-3.6.1 =>
>> valgrind-3.7.0}/fix_issue_caused_by_ccache.patch (100%) rename
>> meta/recipes-devtools/valgrind/{valgrind-3.6.1 =>
>> valgrind-3.7.0}/fix_unsupporting_kernel_3.patch (100%) rename
>> meta/recipes-devtools/valgrind/{valgrind-3.6.1 =>
>> valgrind-3.7.0}/fixed-perl-path.patch (100%) rename
>> meta/recipes-devtools/valgrind/{valgrind_3.6.1.bb => valgrind_3.7.0.bb}
>> (71%)
>> 
>> diff --git
> a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
> b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
>> new file mode 100644 index 0000000..f57897c --- /dev/null +++
>> b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch @@
>> -0,0 +1,23 @@ +To recognize gcc version from poky in configure.in +
>> +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Shane
>> Wang <shane.wang@intel.com> + +diff -r 91a8df96084a configure.in +---
>> a/configure.in	Fri Dec 23 20:57:01 2011 +0800 ++++ b/configure.in	Fri
>> Dec 23 20:59:21 2011 +0800 +@@ -104,11 +104,13 @@ + # + #
>> 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) ++# i586-poky-linux-gcc (GCC)
>> 4.6.3 (prerelease) Copyright + # + [gcc_version=`${CC} --version \ +   
>>           | head -n 1 \ +              | $SED 's/i686-apple-darwin10//'
>> \ +              | $SED 's/i686-apple-darwin11//' \ ++             |
>> $SED 's/.*poky[^0-9]*//' \
> 
> Either change this to work with every TARGET_VENDOR or put it in the poky
> layer as bbappend.

Understood.

--
Shane

Patch

diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
new file mode 100644
index 0000000..f57897c
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
@@ -0,0 +1,23 @@ 
+To recognize gcc version from poky in configure.in
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Shane Wang <shane.wang@intel.com>
+
+diff -r 91a8df96084a configure.in
+--- a/configure.in	Fri Dec 23 20:57:01 2011 +0800
++++ b/configure.in	Fri Dec 23 20:59:21 2011 +0800
+@@ -104,11 +104,13 @@
+ # 
+ # 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)
++# i586-poky-linux-gcc (GCC) 4.6.3 (prerelease) Copyright
+ #
+ [gcc_version=`${CC} --version \
+              | head -n 1 \
+              | $SED 's/i686-apple-darwin10//' \
+              | $SED 's/i686-apple-darwin11//' \
++             | $SED 's/.*poky[^0-9]*//' \
+              | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
+ 
+ is_clang="notclang"
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.6.1/fix_issue_caused_by_ccache.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_issue_caused_by_ccache.patch
similarity index 100%
rename from meta/recipes-devtools/valgrind/valgrind-3.6.1/fix_issue_caused_by_ccache.patch
rename to meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_issue_caused_by_ccache.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.6.1/fix_unsupporting_kernel_3.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_unsupporting_kernel_3.patch
similarity index 100%
rename from meta/recipes-devtools/valgrind/valgrind-3.6.1/fix_unsupporting_kernel_3.patch
rename to meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_unsupporting_kernel_3.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.6.1/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/fixed-perl-path.patch
similarity index 100%
rename from meta/recipes-devtools/valgrind/valgrind-3.6.1/fixed-perl-path.patch
rename to meta/recipes-devtools/valgrind/valgrind-3.7.0/fixed-perl-path.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.6.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
similarity index 71%
rename from meta/recipes-devtools/valgrind/valgrind_3.6.1.bb
rename to meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index 021caa8..03cdd28 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.6.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -3,19 +3,20 @@  HOMEPAGE = "http://valgrind.org/"
 BUGTRACKER = "http://valgrind.org/support/bug_reports.html"
 LICENSE = "GPLv2 & GPLv2+ & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
-                    file://include/pub_tool_basics.h;beginline=1;endline=29;md5=b4765f122b7672cdf9b2e8fd75a33172 \
-                    file://include/valgrind.h;beginline=1;endline=56;md5=13a71cedba99112334d8596162aec37e \
+                    file://include/pub_tool_basics.h;beginline=1;endline=29;md5=0ef036a7ddce4cdc738d65d63b3e8153 \
+                    file://include/valgrind.h;beginline=1;endline=56;md5=aee56014c1dd64260a59fd4df38752f6 \
                     file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
 DEPENDS = "virtual/libx11"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
 	   file://fix_issue_caused_by_ccache.patch \
            file://fix_unsupporting_kernel_3.patch \
-           file://fixed-perl-path.patch"
+           file://fixed-perl-path.patch \
+           file://configure-fix.patch"
 
-SRC_URI[md5sum] = "2c3aa122498baecc9d69194057ca88f5"
-SRC_URI[sha256sum] = "49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e"
+SRC_URI[md5sum] = "a855fda56edf05614f099dca316d1775"
+SRC_URI[sha256sum] = "5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'