From 7a0caa23965185ac8268ae1da2f61fc7ca6de682 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Fri, 24 Mar 2017 17:03:19 +0200 Subject: valgrind: vg_regtest.in: fix perl script @PERL@ in vg_regtest.in causes recipe specific sysroot based perl to be present in the vg_regtest script, making it unusable in the target. Use /usr/bin/perl instead of @PERL@ to fix it. Signed-off-by: Maxin B. John Signed-off-by: Richard Purdie --- .../valgrind/valgrind/fixed-perl-path.patch | 33 +++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch index b054d05f7f..b431d3356e 100644 --- a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch +++ b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch @@ -1,3 +1,8 @@ +From 67e7a690107efb16d6d5aebfe420b64a552accdf Mon Sep 17 00:00:00 2001 +From: Qing He +Date: Tue, 31 Aug 2010 22:51:58 +0800 +Subject: [PATCH] valgrind: fix perl scripts + 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 @@ -11,8 +16,16 @@ a better fix would need: Upstream-Status: Inappropriate [configuration] +Signed-off-by: Maxin B. John +--- + cachegrind/cg_annotate.in | 2 +- + cachegrind/cg_diff.in | 2 +- + massif/ms_print.in | 2 +- + perf/vg_perf.in | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in -index 9dc9565..cc4ef05 100644 +index 69365e8..978265d 100644 --- a/cachegrind/cg_annotate.in +++ b/cachegrind/cg_annotate.in @@ -1,4 +1,4 @@ @@ -22,7 +35,7 @@ index 9dc9565..cc4ef05 100644 ##--------------------------------------------------------------------## ##--- Cachegrind's annotator. cg_annotate.in ---## diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in -index 951066e..84c2dde 100644 +index 395460b..05873cc 100755 --- a/cachegrind/cg_diff.in +++ b/cachegrind/cg_diff.in @@ -1,4 +1,4 @@ @@ -32,7 +45,7 @@ index 951066e..84c2dde 100644 ##--------------------------------------------------------------------## ##--- Cachegrind's differencer. cg_diff.in ---## diff --git a/massif/ms_print.in b/massif/ms_print.in -index e6ffdbf..fb45906 100755 +index e6fae89..3b85b40 100755 --- a/massif/ms_print.in +++ b/massif/ms_print.in @@ -1,4 +1,4 @@ @@ -42,7 +55,7 @@ index e6ffdbf..fb45906 100755 ##--------------------------------------------------------------------## ##--- Massif's results printer ms_print.in ---## diff --git a/perf/vg_perf.in b/perf/vg_perf.in -index 2188a31..83ad024 100644 +index 7a80cb0..28f6156 100644 --- a/perf/vg_perf.in +++ b/perf/vg_perf.in @@ -1,4 +1,4 @@ @@ -51,3 +64,15 @@ index 2188a31..83ad024 100644 ##--------------------------------------------------------------------## ##--- Valgrind performance testing script vg_perf ---## ##--------------------------------------------------------------------## +diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in +index cb05b52..032e947 100755 +--- a/tests/vg_regtest.in ++++ b/tests/vg_regtest.in +@@ -1,4 +1,4 @@ +-#! @PERL@ ++#! /usr/bin/perl + ##--------------------------------------------------------------------## + ##--- Valgrind regression testing script vg_regtest ---## + ##--------------------------------------------------------------------## +--- +2.4.0 -- cgit 1.2.3-korg