From aeee3fb46f7b72e0b08e988a3224e4e2b7d85d84 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 19 Apr 2011 15:22:26 +0800 Subject: valgrind: upgrade to version 3.6.1 (From OE-Core rev: 85898bb2d60ccf171ead561d05f3742a2cf30c8d) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- .../fix_issue_caused_by_ccache.patch | 30 ------------ .../valgrind/valgrind-3.6.0/fixed-perl-path.patch | 51 --------------------- .../fix_issue_caused_by_ccache.patch | 32 +++++++++++++ .../valgrind/valgrind-3.6.1/fixed-perl-path.patch | 53 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.6.0.bb | 27 ----------- meta/recipes-devtools/valgrind/valgrind_3.6.1.bb | 27 +++++++++++ 6 files changed, 112 insertions(+), 108 deletions(-) delete mode 100644 meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_issue_caused_by_ccache.patch delete mode 100644 meta/recipes-devtools/valgrind/valgrind-3.6.0/fixed-perl-path.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind-3.6.1/fix_issue_caused_by_ccache.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind-3.6.1/fixed-perl-path.patch delete mode 100644 meta/recipes-devtools/valgrind/valgrind_3.6.0.bb create mode 100644 meta/recipes-devtools/valgrind/valgrind_3.6.1.bb (limited to 'meta/recipes-devtools/valgrind') diff --git a/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_issue_caused_by_ccache.patch b/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_issue_caused_by_ccache.patch deleted file mode 100644 index a5c273c45b..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_issue_caused_by_ccache.patch +++ /dev/null @@ -1,30 +0,0 @@ -The script does not expect use of ccache, hence fix it to recognise it. - -2010/08/17 -Nitin A Kamble - -Index: valgrind-3.5.0/coregrind/link_tool_exe_linux.in -=================================================================== ---- valgrind-3.5.0.orig/coregrind/link_tool_exe_linux.in -+++ valgrind-3.5.0/coregrind/link_tool_exe_linux.in -@@ -62,6 +62,11 @@ die "Bogus alt-load address" - - # The cc invokation to do the final link - my $cc = $ARGV[1]; -+my $next = 2; -+if ("$cc" eq "ccache") { -+ $cc = "$cc $ARGV[2]"; -+ $next = 3; -+} - - # and the 'restargs' are argv[2 ..] - -@@ -71,7 +76,7 @@ my $cc = $ARGV[1]; - my $cmd="$cc -static -Wl,-Ttext=$ala"; - - # Add the rest of the parameters --foreach my $n (2 .. $#ARGV) { -+foreach my $n ($next .. $#ARGV) { - $cmd = "$cmd $ARGV[$n]"; - } - diff --git a/meta/recipes-devtools/valgrind/valgrind-3.6.0/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind-3.6.0/fixed-perl-path.patch deleted file mode 100644 index 2a0440a1b0..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind-3.6.0/fixed-perl-path.patch +++ /dev/null @@ -1,51 +0,0 @@ -this is a temporary patch to workaround cross compilation. -otherwise @PERL@ will be replaced to perl-native binary, -this creates unusable scripts and fails FILERDEPENDS mechanism -(esp. rpm) - -a better fix would need: - 1. configure.ac should differentiate PERL and HOSTPERL - 2. optionally remove ${STAGING_DIR} in #! line before do_install - -8/31/2010 - created by Qing He - -diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in -index 9dc9565..cc4ef05 100644 ---- a/cachegrind/cg_annotate.in -+++ b/cachegrind/cg_annotate.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - - ##--------------------------------------------------------------------## - ##--- Cachegrind's annotator. cg_annotate.in ---## -diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in -index 951066e..84c2dde 100644 ---- a/cachegrind/cg_diff.in -+++ b/cachegrind/cg_diff.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - - ##--------------------------------------------------------------------## - ##--- Cachegrind's differencer. cg_diff.in ---## -diff --git a/massif/ms_print.in b/massif/ms_print.in -index e6ffdbf..fb45906 100755 ---- a/massif/ms_print.in -+++ b/massif/ms_print.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - - ##--------------------------------------------------------------------## - ##--- Massif's results printer ms_print.in ---## -diff --git a/perf/vg_perf.in b/perf/vg_perf.in -index 2188a31..83ad024 100644 ---- a/perf/vg_perf.in -+++ b/perf/vg_perf.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - ##--------------------------------------------------------------------## - ##--- Valgrind performance testing script vg_perf ---## - ##--------------------------------------------------------------------## diff --git a/meta/recipes-devtools/valgrind/valgrind-3.6.1/fix_issue_caused_by_ccache.patch b/meta/recipes-devtools/valgrind/valgrind-3.6.1/fix_issue_caused_by_ccache.patch new file mode 100644 index 0000000000..4658567b21 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind-3.6.1/fix_issue_caused_by_ccache.patch @@ -0,0 +1,32 @@ +The script does not expect use of ccache, hence fix it to recognise it. + +2010/08/17 +Nitin A Kamble + +Upstream-Status: Inappropriate [configuration] + +Index: valgrind-3.5.0/coregrind/link_tool_exe_linux.in +=================================================================== +--- valgrind-3.5.0.orig/coregrind/link_tool_exe_linux.in ++++ valgrind-3.5.0/coregrind/link_tool_exe_linux.in +@@ -62,6 +62,11 @@ die "Bogus alt-load address" + + # The cc invokation to do the final link + my $cc = $ARGV[1]; ++my $next = 2; ++if ("$cc" eq "ccache") { ++ $cc = "$cc $ARGV[2]"; ++ $next = 3; ++} + + # and the 'restargs' are argv[2 ..] + +@@ -71,7 +76,7 @@ my $cc = $ARGV[1]; + my $cmd="$cc -static -Wl,-Ttext=$ala"; + + # Add the rest of the parameters +-foreach my $n (2 .. $#ARGV) { ++foreach my $n ($next .. $#ARGV) { + $cmd = "$cmd $ARGV[$n]"; + } + diff --git a/meta/recipes-devtools/valgrind/valgrind-3.6.1/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind-3.6.1/fixed-perl-path.patch new file mode 100644 index 0000000000..b054d05f7f --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind-3.6.1/fixed-perl-path.patch @@ -0,0 +1,53 @@ +this is a temporary patch to workaround cross compilation. +otherwise @PERL@ will be replaced to perl-native binary, +this creates unusable scripts and fails FILERDEPENDS mechanism +(esp. rpm) + +a better fix would need: + 1. configure.ac should differentiate PERL and HOSTPERL + 2. optionally remove ${STAGING_DIR} in #! line before do_install + +8/31/2010 - created by Qing He + +Upstream-Status: Inappropriate [configuration] + +diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in +index 9dc9565..cc4ef05 100644 +--- a/cachegrind/cg_annotate.in ++++ b/cachegrind/cg_annotate.in +@@ -1,4 +1,4 @@ +-#! @PERL@ ++#! /usr/bin/perl + + ##--------------------------------------------------------------------## + ##--- Cachegrind's annotator. cg_annotate.in ---## +diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in +index 951066e..84c2dde 100644 +--- a/cachegrind/cg_diff.in ++++ b/cachegrind/cg_diff.in +@@ -1,4 +1,4 @@ +-#! @PERL@ ++#! /usr/bin/perl + + ##--------------------------------------------------------------------## + ##--- Cachegrind's differencer. cg_diff.in ---## +diff --git a/massif/ms_print.in b/massif/ms_print.in +index e6ffdbf..fb45906 100755 +--- a/massif/ms_print.in ++++ b/massif/ms_print.in +@@ -1,4 +1,4 @@ +-#! @PERL@ ++#! /usr/bin/perl + + ##--------------------------------------------------------------------## + ##--- Massif's results printer ms_print.in ---## +diff --git a/perf/vg_perf.in b/perf/vg_perf.in +index 2188a31..83ad024 100644 +--- a/perf/vg_perf.in ++++ b/perf/vg_perf.in +@@ -1,4 +1,4 @@ +-#! @PERL@ ++#! /usr/bin/perl + ##--------------------------------------------------------------------## + ##--- Valgrind performance testing script vg_perf ---## + ##--------------------------------------------------------------------## diff --git a/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb deleted file mode 100644 index a33a540198..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Valgrind memory debugger" -HOMEPAGE = "http://valgrind.org/" -BUGTRACKER = "http://valgrind.org/support/bug_reports.html" -LICENSE = "GPLv2+ & BSD & FDLv1.2" -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://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" -DEPENDS = "virtual/libx11" -PR = "r0" - -SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ - file://fix_issue_caused_by_ccache.patch \ - file://fixed-perl-path.patch" - -SRC_URI[md5sum] = "b289c5f4ab8e39741602445f1dd09b34" -SRC_URI[sha256sum] = "bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f" - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -inherit autotools - -EXTRA_OECONF = "--enable-tls" -EXTRA_OEMAKE = "-w" -PARALLEL_MAKE = "" - -FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug/*" diff --git a/meta/recipes-devtools/valgrind/valgrind_3.6.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.6.1.bb new file mode 100644 index 0000000000..4dbc628d22 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind_3.6.1.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Valgrind memory debugger" +HOMEPAGE = "http://valgrind.org/" +BUGTRACKER = "http://valgrind.org/support/bug_reports.html" +LICENSE = "GPLv2+ & BSD & FDLv1.2" +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://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" +DEPENDS = "virtual/libx11" +PR = "r0" + +SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ + file://fix_issue_caused_by_ccache.patch \ + file://fixed-perl-path.patch" + +SRC_URI[md5sum] = "2c3aa122498baecc9d69194057ca88f5" +SRC_URI[sha256sum] = "49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e" + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +inherit autotools + +EXTRA_OECONF = "--enable-tls" +EXTRA_OEMAKE = "-w" +PARALLEL_MAKE = "" + +FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug/*" -- cgit v1.2.3-54-g00ecf