[oe-commits] [meta-openembedded] 15/19: grpc: Link with libatomic on clang/x86

[git at git.openembedded.org]

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

armin_kuster pushed a commit to branch zeus-next
in repository meta-openembedded.

commit 189ba6b49974934d0aa7b1d77996570b7a65b1a9
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Mon Nov 18 16:46:29 2019 -0800

    grpc: Link with libatomic on clang/x86
    
    clang does delegate the atomic<double> calls to libatomic on x86 where
    as gcc tries to use intrinsics, its debatable who is right, but it does
    seem that clang is safe in case pointer is unaligned
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
    (cherry picked from commit f7a7a2aafe87437aefca21612dc156fde645ac89)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb
index 8d54dbe..c11b556 100644
--- a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb
+++ b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb
@@ -44,6 +44,10 @@ do_configure_prepend_mipsarch() {
     sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
 }
 
+do_configure_prepend_toolchain-clang_x86() {
+    sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
+}
+
 BBCLASSEXTEND = "native nativesdk"
 
 SYSROOT_DIRS_BLACKLIST_append_class-target = "${baselib}/cmake/grpc"

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