diff options
author | Zhixiong Chi <zhixiong.chi@windriver.com> | 2018-04-11 16:26:18 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-13 16:58:07 +0100 |
commit | 18fd9004689060e23b6775881f0a20e173f20bea (patch) | |
tree | fe70768d498b6c0be52c726e82b8393e8012aaa9 /meta/recipes-devtools/valgrind/valgrind | |
parent | f6d8c3f88504307da2123b6da2b010e29bc79eed (diff) | |
download | poky-18fd9004689060e23b6775881f0a20e173f20bea.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)
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>
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch | 35 |
1 files changed, 0 insertions, 35 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 e9112da0cb..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From f96cf1f4eaa72860ab8b5e18ad10fdc704d78c5f Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 15 Dec 2015 15:01:34 +0200 | ||
4 | Subject: [PATCH 2/5] remove rpath | ||
5 | |||
6 | Upstream-Status: Inappropriate [embedded config] | ||
7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
8 | --- | ||
9 | none/tests/Makefile.am | 3 +-- | ||
10 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am | ||
13 | index 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 | -- | ||
34 | 2.6.2 | ||
35 | |||