summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhixiong Chi <zhixiong.chi@windriver.com>2018-04-11 08:26:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-05 16:02:44 (GMT)
commit98e473329e83e169c467f7ccbec36dedf3eb5b9e (patch)
tree026d5bceb17f9cc667d66ab07255f79b866cbcba
parentca6bdf1805375216f8f7de03665fe9bf8012cff0 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch35
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.13.0.bb3
2 files changed, 2 insertions, 36 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch b/meta/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch
deleted file mode 100644
index e9112da..0000000
--- a/meta/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From f96cf1f4eaa72860ab8b5e18ad10fdc704d78c5f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 15 Dec 2015 15:01:34 +0200
4Subject: [PATCH 2/5] remove rpath
5
6Upstream-Status: Inappropriate [embedded config]
7Signed-off-by: Saul Wold <sgw@linux.intel.com>
8---
9 none/tests/Makefile.am | 3 +--
10 1 file changed, 1 insertion(+), 2 deletions(-)
11
12diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
13index 54f2a7e..25b0f49 100644
14--- a/none/tests/Makefile.am
15+++ b/none/tests/Makefile.am
16@@ -326,7 +326,6 @@ threadederrno_CFLAGS += --std=c99
17 endif
18 tls_SOURCES = tls.c tls2.c
19 tls_DEPENDENCIES = tls.so tls2.so
20-tls_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests
21 tls_LDADD = tls.so tls2.so -lpthread
22 tls_so_SOURCES = tls_so.c
23 tls_so_DEPENDENCIES = tls2.so
24@@ -334,7 +333,7 @@ if VGCONF_OS_IS_DARWIN
25 tls_so_LDFLAGS = -dynamic -dynamiclib -all_load -fpic
26 tls_so_LDADD = `pwd`/tls2.so
27 else
28- tls_so_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests -shared -fPIC
29+ tls_so_LDFLAGS = -shared -fPIC
30 tls_so_LDADD = tls2.so
31 endif
32 tls_so_CFLAGS = $(AM_CFLAGS) -fPIC
33--
342.6.2
35
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
index 9390d30..d3af35e 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
88do_configure_prepend () { 87do_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
92do_install_append () { 93do_install_append () {