diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-12-28 01:01:47 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-03 12:35:53 +0000 |
commit | 0e7c84b69e53b37dc2850e4060e99b805658e374 (patch) | |
tree | 9aba7bd73953ef44b3d67bd48610ef1b0faeb38c /meta/recipes-devtools | |
parent | d7d492af8e0713eb31257135acf2b138ddb4de17 (diff) | |
download | poky-0e7c84b69e53b37dc2850e4060e99b805658e374.tar.gz |
valgrind: Fix a race issue for libcoregrind.a
The libnolto_coregrind_a_OBJECTS is in libcoregrind_a_LIBADD, so the objects
should be ready before generate libcoregrind.a, otherwise there would be
failures:
i586-poky-linux-ar: libnolto_coregrind_x86_linux_a-m_libcsetjmp.o: No such file or directory
make[3]: *** [libcoregrind-x86-linux.a] Error 1
Add libnolto_coregrind_a_OBJECTS to EXTRA_libcoregrind_DEPENDENCIES to fix the
problem.
This is a race issue during parallel build.
(From OE-Core rev: 713d6978894269e5b463c3731c03da7e83956743)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch | 45 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.14.0.bb | 1 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch b/meta/recipes-devtools/valgrind/valgrind/0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch new file mode 100644 index 0000000000..bedf1c1274 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 7820fc268fae4353118b6355f1d4b9e1b7eeebec Mon Sep 17 00:00:00 2001 | ||
2 | From: Philippe Waroquiers <philippe.waroquiers@skynet.be> | ||
3 | Date: Sun, 28 Oct 2018 18:35:11 +0100 | ||
4 | Subject: [PATCH] Fix dependencies between libcoregrind*.a and | ||
5 | *m_main.o/*m_libcsetjmp.o | ||
6 | |||
7 | The primary and secondary coregrind libraries must be updated | ||
8 | when m_main.c or m_libcsetjmp.c are changed. | ||
9 | |||
10 | A dependency was missing between libcoregrind*.a and libnolto_coregrind*.a, | ||
11 | and so tools were not relinked when m_main.c or m_libcsetjmp.c were | ||
12 | changed. | ||
13 | |||
14 | Upstream-Status: Backport[git://sourceware.org/git/valgrind.git 7820fc268fae4353118b6355f1d4b9e1b7eeebec] | ||
15 | |||
16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
17 | --- | ||
18 | coregrind/Makefile.am | 4 ++++ | ||
19 | 1 file changed, 4 insertions(+) | ||
20 | |||
21 | diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am | ||
22 | index 914a270..8de1996 100644 | ||
23 | --- a/coregrind/Makefile.am | ||
24 | +++ b/coregrind/Makefile.am | ||
25 | @@ -511,6 +511,8 @@ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS += \ | ||
26 | endif | ||
27 | libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_LIBADD = \ | ||
28 | $(libnolto_coregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_OBJECTS) | ||
29 | +libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_DEPENDENCIES = \ | ||
30 | + libnolto_coregrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a | ||
31 | |||
32 | if VGCONF_HAVE_PLATFORM_SEC | ||
33 | libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \ | ||
34 | @@ -531,6 +533,8 @@ libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS += \ | ||
35 | endif | ||
36 | libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_LIBADD = \ | ||
37 | $(libnolto_coregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_OBJECTS) | ||
38 | +libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_DEPENDENCIES = \ | ||
39 | + libnolto_coregrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a | ||
40 | endif | ||
41 | |||
42 | #---------------------------------------------------------------------------- | ||
43 | -- | ||
44 | 2.10.2 | ||
45 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb index bbbc3bf695..4d15a50411 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb | |||
@@ -37,6 +37,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ | |||
37 | file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \ | 37 | file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \ |
38 | file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ | 38 | file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ |
39 | file://0001-tests-amd64-Do-not-clobber-rsp-register.patch \ | 39 | file://0001-tests-amd64-Do-not-clobber-rsp-register.patch \ |
40 | file://0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch \ | ||
40 | " | 41 | " |
41 | SRC_URI[md5sum] = "74175426afa280184b62591b58c671b3" | 42 | SRC_URI[md5sum] = "74175426afa280184b62591b58c671b3" |
42 | SRC_URI[sha256sum] = "037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5" | 43 | SRC_URI[sha256sum] = "037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5" |