diff options
author | Zhixiong Chi <zhixiong.chi@windriver.com> | 2018-04-11 16:26:18 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-05 16:02:44 +0000 |
commit | 98e473329e83e169c467f7ccbec36dedf3eb5b9e (patch) | |
tree | 026d5bceb17f9cc667d66ab07255f79b866cbcba /meta/recipes-devtools/valgrind/valgrind_3.13.0.bb | |
parent | ca6bdf1805375216f8f7de03665fe9bf8012cff0 (diff) | |
download | poky-98e473329e83e169c467f7ccbec36dedf3eb5b9e.tar.gz |
valgrind: fix the shared object issue while prelink ptest
If valgrind-ptest is installed, we will get the some prelink error
like below at do_image:
.../usr/sbin/prelink: /usr/lib64/valgrind/ptest/memcheck/tests/wrap7:\
Could not find one of the dependencies: \
.../usr/sbin//prelink-rtld: error \
while loading shared libraries: wrap7so.so: cannot open shared \
object file: No such file or directory
The wrap7 needs to link the shared object in the path
/usr/lib64/valgrind/ptest/memcheck/tests, but it fails.
So we correct the path for ptest.
(From OE-Core rev: 1ec0c977c55ae2c38252e1807dc15c56007d30dc)
(From OE-Core rev: f679285f54fa1d160d22a25682d50eb5032c2569)
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind_3.13.0.bb')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.13.0.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb index 9390d30444..d3af35e7f8 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb | |||
@@ -16,7 +16,6 @@ SRC_URI = "ftp://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
16 | file://fixed-perl-path.patch \ | 16 | file://fixed-perl-path.patch \ |
17 | file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ | 17 | file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ |
18 | file://run-ptest \ | 18 | file://run-ptest \ |
19 | file://0002-remove-rpath.patch \ | ||
20 | file://0004-Fix-out-of-tree-builds.patch \ | 19 | file://0004-Fix-out-of-tree-builds.patch \ |
21 | file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ | 20 | file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ |
22 | file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ | 21 | file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ |
@@ -87,6 +86,8 @@ def get_mcpu(d): | |||
87 | 86 | ||
88 | do_configure_prepend () { | 87 | do_configure_prepend () { |
89 | rm -rf ${S}/config.h | 88 | rm -rf ${S}/config.h |
89 | sed -i -e 's:$(abs_top_builddir):$(pkglibdir)/ptest:g' ${S}/none/tests/Makefile.am | ||
90 | sed -i -e 's:$(top_builddir):$(pkglibdir)/ptest:g' ${S}/memcheck/tests/Makefile.am | ||
90 | } | 91 | } |
91 | 92 | ||
92 | do_install_append () { | 93 | do_install_append () { |