[oe-commits] [openembedded-core] 07/12: valgrind: Fix a race issue for libcoregrind.a

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit afd56c2d1cf8fef58822ee8279a61e3ea9bc4f32
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Fri Dec 28 01:01:47 2018 -0800

    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.
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 ...ncies-between-libcoregrind-.a-and-m_main..patch | 45 ++++++++++++++++++++++
 meta/recipes-devtools/valgrind/valgrind_3.14.0.bb  |  1 +
 2 files changed, 46 insertions(+)

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 0000000..bedf1c1
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch
@@ -0,0 +1,45 @@
+From 7820fc268fae4353118b6355f1d4b9e1b7eeebec Mon Sep 17 00:00:00 2001
+From: Philippe Waroquiers <philippe.waroquiers at skynet.be>
+Date: Sun, 28 Oct 2018 18:35:11 +0100
+Subject: [PATCH] Fix dependencies between libcoregrind*.a and
+ *m_main.o/*m_libcsetjmp.o
+
+The primary and secondary coregrind libraries must be updated
+when m_main.c or m_libcsetjmp.c are changed.
+
+A dependency was missing between libcoregrind*.a and libnolto_coregrind*.a,
+and so tools were not relinked when m_main.c or m_libcsetjmp.c were
+changed.
+
+Upstream-Status: Backport[git://sourceware.org/git/valgrind.git 7820fc268fae4353118b6355f1d4b9e1b7eeebec]
+
+Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
+---
+ coregrind/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
+index 914a270..8de1996 100644
+--- a/coregrind/Makefile.am
++++ b/coregrind/Makefile.am
+@@ -511,6 +511,8 @@ libcoregrind_ at VGCONF_ARCH_PRI@_ at VGCONF_OS@_a_CFLAGS += \
+ endif
+ libcoregrind_ at VGCONF_ARCH_PRI@_ at VGCONF_OS@_a_LIBADD = \
+     $(libnolto_coregrind_ at VGCONF_ARCH_PRI@_ at VGCONF_OS@_a_OBJECTS)
++libcoregrind_ at VGCONF_ARCH_PRI@_ at VGCONF_OS@_a_DEPENDENCIES = \
++    libnolto_coregrind- at VGCONF_ARCH_PRI@- at VGCONF_OS@.a
+ 
+ if VGCONF_HAVE_PLATFORM_SEC
+ libcoregrind_ at VGCONF_ARCH_SEC@_ at VGCONF_OS@_a_SOURCES = \
+@@ -531,6 +533,8 @@ libcoregrind_ at VGCONF_ARCH_SEC@_ at VGCONF_OS@_a_CFLAGS += \
+ endif
+ libcoregrind_ at VGCONF_ARCH_SEC@_ at VGCONF_OS@_a_LIBADD = \
+     $(libnolto_coregrind_ at VGCONF_ARCH_SEC@_ at VGCONF_OS@_a_OBJECTS)
++libcoregrind_ at VGCONF_ARCH_SEC@_ at VGCONF_OS@_a_DEPENDENCIES = \
++    libnolto_coregrind- at VGCONF_ARCH_SEC@- at VGCONF_OS@.a
+ endif
+ 
+ #----------------------------------------------------------------------------
+-- 
+2.10.2
+
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb
index bbbc3bf..4d15a50 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 \
            file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \
            file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \
            file://0001-tests-amd64-Do-not-clobber-rsp-register.patch \
+           file://0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch \
            "
 SRC_URI[md5sum] = "74175426afa280184b62591b58c671b3"
 SRC_URI[sha256sum] = "037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.