CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

valgrind: fix perl scripts

Browse Source 
svn version of valgrind uses #! @PERL@ for several perl
scripts. However, PERL in autoconf doesn't distinguish
host perl and target perl, causing STAGING_DIR_NATIVE be
written in the output scripts.

This causes unrunnable scripts, and fails FILERDEPENDS
mechanism (thus also do_rootfs_rpm).

Uses /usr/bin/perl instead to fix it.

Signed-off-by: Qing He <qing.he@intel.com>
This commit is contained in:
Qing He 2010-08-31 22:51:58 +08:00 committed by Richard Purdie
parent 33ed325337
commit dd5509458f
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch Normal file
View File

@ -0,0 +1,51 @@
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 <qing.he@intel.com>
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 ---##
##--------------------------------------------------------------------##

5
meta/recipes-devtools/valgrind/valgrind_3.5.0.bb
View File

@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
file://include/valgrind.h;beginline=1;endline=56;md5=13a71cedba99112334d8596162aec37e \
file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
DEPENDS = "virtual/libx11"
PR = "r3"
PR = "r4"
SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
file://valgrind_3.5.0-svn_r11264.patch.bz2 \
file://fix_issue_caused_by_ccache.patch "
file://fix_issue_caused_by_ccache.patch \
file://fixed-perl-path.patch"
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'