From patchwork Fri Apr 8 07:30:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 6455 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7907CC4167D for ; Fri, 8 Apr 2022 17:09:35 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.72]) by mx.groups.io with SMTP id smtpd.web10.3088.1649403026558679978 for ; Fri, 08 Apr 2022 00:30:31 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=pkQy2Nhm; spf=pass (domain: weidmueller.com, ip: 40.107.8.72, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U1uVXRATT9jgPQfe3TDxYmHYHHDc5oAguT0mLZQFw9L4qOPuKBGsR52ZkOxX25MShBng4Cke/r13rcrEubj2HOwXP9VcUQaxuJW6CNSUWhcr45eLXPR9Qpbh4hDhMfTjb7Ln3bmVyGL6wzFdEsCg0YxtSlr4XOTG83a1Z0o0ELOINITxHvtddHu0rct0dWUaHfqZgghOxx7n1Toxn+rOqSJvTQQtOkJSKr7bAMn0bHZ2BwA8WSEU9w+7ipKbyaPfESlZV7uwpl2kgP0/DsHiILyMM8+nBLkMf4w1ZeRLN4FeON5VkuC7H/dG5isJJk8DAckaWHZ/sVAYmi4kw05IOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7K+8ThgkXHyGwbYlo9CozuIgOxReCOGo3OH1Gp4K9GY=; b=EDwcrVlv2s1X+8sScyZszlGhtvTktgphlKeEhsxp2M3HLBNsHd8Fh9GY48h0wI/N03vBwL4IW0lYI238oyp43Ku+Db//OrDbsOAn1MkbdmMHBr9xY30TiYj3tN+U6gBDnegxPGjpPywg1fh8TeQRbDT+/Ski6ZrU4Kk9clrXNSS0w3j8g57yqG6QVa628Ji+y/U5l5ioUWi0l08V7/shmqeiyL3ZorBT4qOH94ps522To1D4P3G2VCxnvWDm25W9HAvXu2qXM+oDlvMgFDHagcJbb/Ut/bSYgm5F3XXXlEQWxHA0XHrAuEHUz1yl7ek168vHPJraDU++XiV0q/W4pQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7K+8ThgkXHyGwbYlo9CozuIgOxReCOGo3OH1Gp4K9GY=; b=pkQy2NhmVAdubFgvpO361lm/Y6R3LZL4Tr2oNjfn3Ho1VJABDg5k2hZaxTOoVFh2SQUmo3JCQTXtoikCJp/LY1pYe5Sksk8lcPy85b/npNmixxn28RoZURfd99DLGemmBQoeKxvRr0d8vzmTInkwCn4A6v7ixQb4qoWsgm4rsM8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PA4PR08MB5919.eurprd08.prod.outlook.com (2603:10a6:102:e0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.22; Fri, 8 Apr 2022 07:30:22 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::c53d:64fa:866b:b512]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::c53d:64fa:866b:b512%7]) with mapi id 15.20.5144.022; Fri, 8 Apr 2022 07:30:22 +0000 From: Stefan Herbrechtsmeier To: openembedded-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [meta-oe][PATCH v2 1/2] grpc: add cmake support for target Date: Fri, 8 Apr 2022 09:30:03 +0200 Message-ID: <20220408073004.20207-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: AS9PR06CA0104.eurprd06.prod.outlook.com (2603:10a6:20b:465::16) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a49dad38-1810-4406-a764-08da1931a41e X-MS-TrafficTypeDiagnostic: PA4PR08MB5919:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yGySfbxxRACNL2JacFa7foKmj+QVGJHpGvBAmoP3e7DfDI4pW686G6/QTmOXmEI4yEvUvHgIDGnJDx6YGkUMKCIxKQ1GvjUNXFH4qoemgsOtCOdilPvUcDSMDFn5tIDq+Fbg52Tcfbv81wST/BP3pLDGU18q0qrXL6kHMSspWuHoDpdEWMLnBjLl1++aKUHix7rL/Sl9+QVUFk6rXWyf+0T2bnvM6duYBmKKY0x9tTgIaTAtQ0ZMz2oGnIH5ZH/+QH4tiHJsH1UHf2wCWs50vIgspfapnNMl5Zd8BFSsgPGRg0ZUTTwtoJ7hHoLcAIgY1wXvelHg1gIbU+XqhsBHjoFqxQ+KeyFh7BKAfCnjTXNL1zP4iw6LRQL9hYwuLMtemUOOPsMH1TIz2zLw5idzALStAR61tbYIzHlNcn5EYlfGKwey3PN8N+gA6mZpWHroFxRNZBYtCQM61Bj4fVMdFWLeTMH3QZ4J0aQMzcPmx7Ky7me4ihUNgkAMlSXrgqwABOmb5iJA+EWtOGZLprH5CLz1AQqJDIWWsF2cN/QXvPIzl5hByroaPagrKgunI1Ppk2paViokicQc5IoPaMZMW8TrvTX4CUFyNrAcVbkFK0RpdWTO6iUEvX/yVV5A3n3yl2kGkyqoLpuZ3RmexjqXNEa/mVvmp8yJ4oamScMTztSNKefKuC/SnodRFe1DtnATXyBYwRVbEVxq6zrtEDgfJv8IFvGam9W+9ET2R9uK5bWbMWg4L/lCLKSEZ1s7ycPm1t7KPOPVSNx4BSKOmbzjKA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(508600001)(6486002)(4326008)(5660300002)(8936002)(107886003)(86362001)(6512007)(26005)(186003)(2616005)(6666004)(52116002)(2906002)(6506007)(38100700002)(66946007)(66476007)(66556008)(316002)(8676002)(36756003)(6916009)(1076003)(83380400001)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l2KCzWwdpzHNad971CDIgI9m2TpvPYaILqGd5HIkCQlHv/AsvdNIx/qpQ9LPfq6bOc2vssYhu/cSQ+/btoF9AwRexcF+AnQQclcoV/DsDSPB57yvJ1TqWqVcGxIxsUXQMmcC/sqWNFt1VKqSOgw+tbdISnP1SzuBVSca8G4LtRQ+XWE9QN2ZdmY31Z8f5UeDTJn2lAzJauKEhzQxQhBZiurrWIM6KF3EAJiFo/QfkZhPCXvjW6ZA08+6R93aAawFiwhyJLI+DsZx2xvGPqOrOGMZ9w4OXLGP+u+5N/IUlep270XlWgfBSSxSyquk7zzwVhNafT8w7C9aQHOckhm/StnShPEaw3MFKqkNY47znS4y3Lw+IZ8iCCzjiixQdXr28eCDQ5UL/mTyjQ58UG2SkUlIf6JJ4mznVWwHAVzw8sxmhbjQqMbeywr4qg1ok29r9c3azUUKlVY8UobLmR0P7fkuvG4mGJjYqQn01iBBGSfGCNE2hF53aY9RYLQe+7uBzvUkfrzu5d3SzR6sU+AjYnxoTyi5vskJt94tNBVkcE8UyIx+IF2ZnMV/lMJfcqtFWZYNzmYK8e0wAHrsu2agYnwBgcPe6bUj7TFwcELO8exdFac1VTcOvwZwwUWmIMiRjX/LS9YYenlBXqUYUgdt2nE02/zAnfzvdE2AmM7B+5D57xdFQOCuvD7mC7lFnRrl7WhPWNd9y6650mxuiFLUwM6g0TleZ4IYsxx1o5OUsri+QnHJT/Fo3yjIEUZFAhHqzVoj//ogxYFNAzmADEODhJUyFEoZZFE77RxXlgEi6x1ybj6/phDG7pNdPJOvo5cGf2yYkWd3V+jbFc3umn4g5zYh+WsIQsYUaQWyxcEc9HdpH5j7VMP29cxIr/sMDD1IuKggL4Ry1N8xj6GTefhuk0rw5hVtIKxNxdxGx7gO58E0eIJZpCNwf6Atm2E0ODCEP1GCVrKPt1w6Pi64QHvSaF4Y7s4J/mbm67IHgaEYQ3OMET0pO+51K3KaYMQ5MRUSlY57baZMLi4d1vSKAxHZRZODxAyR8fFZaEhNzczrmJF10Vo89QN4oD4hGxmHdLWdHTQrrTAp3ERjXxCyc9NC7wNS49cLTrBJu3EQ82BjBRritb3h2DtLs2TpOCfjELGiuBeS9Rkk+Yv/Rk9YSsRtdWUe0JLib5Q342D1QaaOeTCbsEJp+JvW7fpSHaOOWOG+eU8DwLNz2bzfjaJ38XF58hZSnNs41l2pGQ2Is7XW3vMioFYTgRnZ7mAG88z717GMwo0ZCl74rrBeSQmR98cq2Re7kGn2Ut/7w2ArT8KgBI1j4eccPPKlGxYjbWumXYn+jG0IlMFv3ulgeUc15P0LurHSC6+hh1AUw5rFepgEiqoMxPa4BnGDJZz7fCGIPyZIKMvA6VoiZsiWlx8aJ7u0gLwC5/5z3bARqqbbfEfe23JUyLWiADPfdVE3+qbBHnelGSEcuYDLHeZIQKP7xlxXJ2Z30P5dJ8vzZeo8OfE1mO0KWEoZdZjNQWI/F8wGc9hfwTdmEC0ZqA1BAx3Yg7qYg3hIuNRzvVlaRA/IB5SMcORJqglSWkKPko2C5jeZ9P7vE+NC/5FCJJlflgMP1C5qaGkQOg9qt7RZAfE0veSZrFOITut7OdEBVyzZurPLDfb8mtk8DsvvP9ZeL7GTBRsM4UdLsTlK7qSVDXJkmO8SrZsVR349CAr+lmBTAn6AT7u5DsjFq1y7BXtg0AHe2FaqhecV3emBURk3Nq60DHi26NQ= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: a49dad38-1810-4406-a764-08da1931a41e X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2022 07:30:22.5316 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UPzSKM8/SmOY1qtGjFYWgX/Pwxb8g/PYvmOKWOHy8unbIZrBTtSCZnV44jdASUk6vn67t9FnQvVSY7NaD6fodg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB5919 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 Apr 2022 17:09:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96473 From: Stefan Herbrechtsmeier The CMake gRPC config checks for binaries and fails if a binary (plugin) is missing. Fix the problem in the code and add the CMake gRPC config back to the target package. Signed-off-by: Stefan Herbrechtsmeier Tested-by: Clément Péron --- Changes in v2: - Rebase on top of latest master ...d-separate-export-for-plugin-targets.patch | 93 +++++++++++++++++++ meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb | 3 +- 2 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch new file mode 100644 index 000000000..679bd3882 --- /dev/null +++ b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch @@ -0,0 +1,93 @@ +From 3150cb043363e05588062dd392b940be25594713 Mon Sep 17 00:00:00 2001 +From: Stefan Herbrechtsmeier +Date: Tue, 18 Feb 2020 14:17:07 +0100 +Subject: [PATCH] cmake: add separate export for plugin targets + +Upstream-Status: Submitted [https://github.com/grpc/grpc/pull/29328] + + +--- + CMakeLists.txt | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index efdaf8936d..6608b1b00c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10935,7 +10935,7 @@ target_link_libraries(grpc_cpp_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -10975,7 +10975,7 @@ target_link_libraries(grpc_csharp_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_csharp_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11015,7 +11015,7 @@ target_link_libraries(grpc_node_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_node_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_node_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11055,7 +11055,7 @@ target_link_libraries(grpc_objective_c_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_objective_c_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11095,7 +11095,7 @@ target_link_libraries(grpc_php_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_php_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_php_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11135,7 +11135,7 @@ target_link_libraries(grpc_python_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_python_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_python_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11175,7 +11175,7 @@ target_link_libraries(grpc_ruby_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_ruby_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -17349,6 +17349,10 @@ if(gRPC_INSTALL) + DESTINATION ${gRPC_INSTALL_CMAKEDIR} + NAMESPACE gRPC:: + ) ++ install(EXPORT gRPCPluginTargets ++ DESTINATION ${gRPC_INSTALL_CMAKEDIR} ++ NAMESPACE gRPC:: ++ ) + endif() + + include(CMakePackageConfigHelpers) +-- +2.30.2 + diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb b/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb index 872bc6afc..292ea7f9b 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb +++ b/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb @@ -24,6 +24,7 @@ SRCREV_grpc = "1c159689ceda2c408f7f9d97d96a264c9521b806" BRANCH = "v1.45.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ + file://0001-cmake-add-separate-export-for-plugin-targets.patch \ " # Fixes build with older compilers 4.8 especially on ubuntu 14.04 CXXFLAGS:append:class-native = " -Wl,--no-as-needed" @@ -80,8 +81,6 @@ do_configure:prepend:toolchain-clang:x86() { BBCLASSEXTEND = "native nativesdk" -SYSROOT_DIRS_IGNORE:append:class-target = " ${baselib}/cmake/grpc" - FILES:${PN}-compiler += " \ ${bindir} \ ${libdir}/libgrpc_plugin_support${SOLIBS} \ From patchwork Fri Apr 8 07:30:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 6456 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7916FC4167E for ; Fri, 8 Apr 2022 17:09:35 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.72]) by mx.groups.io with SMTP id smtpd.web10.3088.1649403026558679978 for ; Fri, 08 Apr 2022 00:30:29 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=DvL1ho8B; spf=pass (domain: weidmueller.com, ip: 40.107.8.72, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ELV+JsOZgcByBLzoFkFjGlUKL99dJyQ+kH8RPVK+7VFH8vpmzSLkdZJJau7zk9AEN5q7mWgEVboO6zN6DqWS0saH8PqdJ4USZCsWK3rSiLW5g+YJHYYBVgPzXG3fZk9IrjDCYMJ+t/98cqew1mxTiLYChb8XaZ449zgB4NnsV1njRsok/qFK8Se7STdLCFtASCO3R9DK968GtROo6UoAw0p1RN2uo/BY0nj74FuYXgaxgv4ISUrKSZk6K0djORUhPFpFvDXG/z7DBBiwwSxI9eKKEXnkMV+3TFNaMW/5Sw0ABN/2NkD9rvT3xMlL+n5aJJssCtDCZD/JAJMef2q0Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8Nwuf8mjtmn6h5W9DzK8qz0usUIEdC5lTOiqoNmeVWM=; b=l0OqNd744eahjXfNK3MpEHjHQC6KLOMkF6qHAOc6sh4l3rm2zEBRnYgK6mv+Qge0jaKzEqIXIodIfhbrqezDlrFgme2KbhQIzZOjK1SGgyYlSZaRAp/y+1YhntZQ4pTowsxHE3j9WgIwW07Ft/R4+Uw54RpkfAPAChSw433u4hOZeUq3wSHGyyadYDun1KXtB6lP1tH2EP7oQPNH/Ar5WqFqC+rfXzlDBqfhcVsY3TvcxJbFULmsfSGmpEZTsiOuKpCHNsnFzELNni5+RxRsVGzhZQ547UCUDi7U6k3hdxCRGrjiOoQY4clh0l4ZGx5zVtNiV1lNnhVa9Fc22t2maQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8Nwuf8mjtmn6h5W9DzK8qz0usUIEdC5lTOiqoNmeVWM=; b=DvL1ho8B41T8pWubzp6Rq2zbiQoIEMs83XfrkDA99433zvp9AFpNi03nYXmaaqfFeHA/uiR9ns+ZPUWgQph18AxHQC+Skh46a1n8WDxsrBZllrxFdqdEXTIXSgiBY5UYIwTXTvYIcxVTjapuKiRbOOle26N7pZYR5y76IGh6y4Y= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PA4PR08MB5919.eurprd08.prod.outlook.com (2603:10a6:102:e0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.22; Fri, 8 Apr 2022 07:30:23 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::c53d:64fa:866b:b512]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::c53d:64fa:866b:b512%7]) with mapi id 15.20.5144.022; Fri, 8 Apr 2022 07:30:23 +0000 From: Stefan Herbrechtsmeier To: openembedded-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [meta-oe][PATCH v2 2/2] grpc: remove useless link with libatomic append Date: Fri, 8 Apr 2022 09:30:04 +0200 Message-ID: <20220408073004.20207-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220408073004.20207-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220408073004.20207-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0104.eurprd06.prod.outlook.com (2603:10a6:20b:465::16) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 547dd2be-36cc-4367-3f86-08da1931a45a X-MS-TrafficTypeDiagnostic: PA4PR08MB5919:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h7MoVNVRgd70ExQBvi++Kbc9xPd+u2J+lWLTJUp0MvNjIyzO4o/NLUS7FvYin20jxXtrg2Al1eYqp4ZHx9AiL+m5JzP0ZQlhFXlDJTy8Nc5YoRYEfCq4Ia4A5+fbVRWMa4yyPNmYOTgZZ99cjGo+ZMadu/stobbIkV2PlsErersoh8YjcCy2hyMeXPyJre9ZOubSMxFI/3ud1wYrh0PKUEe3/caD6JQSzMs1fSWmRYLRz5lK5Oni2XSDn3K3AxOQVpVOCIR6GItpGAP2ewwL8YhZswJtIXMr3gwzcTCafDlILFHTPX6wfbRu1u/yaGBNOoMCIozc//q3H8EXI2ntxzOtzHIFzf/RjyWRjoHr4oTqLBl//c3HE2nk7isardR2gnt1QzTWM4tWsJmzWbQoYFaFJIJxDbFCiFInsMa9q81gm04KjwespFQqNfdFkL/0rdAj27P/BVUIe5gzrEGSD9epx7egGec9BfPtEB7KLqHvEuuWILrS702w7biEFKkuNVl0olIg+JHtWQEkkP86nS/EuRBvsBBHL/eSLFrajQV9643i4eCUMDq8UBdtemmj0/wmGkpG1NvENgLyvbFNFabNjGMYPItfzGg7idKmUTGqqX8k3uos2guK1Ndsh9DWE3rGfUKo1KtIJeaLg0DHAHtQrwbiprtOZJAQjn2TQQYkxHhkX+f7tSB98+59Xa0FEvlgRk1lB9Htl0IodLFwkQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(508600001)(6486002)(4326008)(5660300002)(8936002)(107886003)(86362001)(6512007)(26005)(186003)(2616005)(6666004)(52116002)(2906002)(6506007)(38100700002)(66946007)(66476007)(66556008)(316002)(8676002)(36756003)(6916009)(1076003)(83380400001)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tFohncpR0xbxc9zwJs3/OJ6h5ufVfAn6X1eUCQh2527LltlXjBF396u1ijfLc2xMMyZm3wmjIkv8w5dfdCg1J41y5ATNIn2CrCMgLUF6Bu2mQS4ULTV8RcNMULopyHA6BzbxYuOPPi5H2vV98Ej4txRYZN5y5iZfGrsgQzzLZQZF8rwqNXT4QQgyecHah07hcP7lp17veE1o9fXg2jApEBFqww5rpXRTnk3+mPUoAMDtb3bS4u1GFx12kkmF0GpHntbUCrGK+bhrBfcQoBKiOnqniSx1itysdyb2rk63wVwt4HL/slk4K7vwWkOfSK//2hEdHwEOc/Q/qlbUlMwZpZi6cKa2ZHlBdFekhQNOEKvX3WoMqVlKJHMSaLdKKRCHlQoheKsfuT/eE+d68Q7Ssh7eI98qG43nz3uAQme7JN1gMrLxkIfwUhAjXhFmbTuCaGU8l+J4MHAZhoE9oiL+Bi9ANV0nFGhJ6X73wWnarJkrxZzC3lGVOUzJ9YzIdHE/Ezt1/NnSg38M92qUOW3+Inulu/Ge4JyfiwQeu7TtYkBhPcQ3AZriC1++oiL7HVny2YLHTYCTfIh9THIMwtDirQnUT+FV6V1lXu/46cswCEnru5SXYFcDMV0RYhLzlLDDvxMhK6sZ9JPVbaNR3W8irbFmWSYxfdHoc1wLnBGuWja8/sWWISValH/zD376V3e9G9cMwMFtSQW+oI7GAsJQPVM7y938r7QoauHoMfbvxST8jj90KSOylyOCYHYA1wTXp1MwCtNyLDpuv0jxe4x0gKrjdl3qjh+xUs9FgsuZiIxf9LT9uplfrgJN4hhxwQ0PQDC2Yo30GhmyQTmFGKSvz99+r4eLLhLiTEMgqsEXMXD+MwkwFY5drpguftsgMSKEBtGgVGtc80wqurUTkFFrx4Ar3sakmWWLsEuhQcNC7v1tTLvjISeTczdN6zYqYYkQrKwz7Ifv71NcPvrhYfDtOZeru1j3WRieHhKx97Fee86E2bF//6ebmKyFMVQ/QvVwL4ocpdc6hk9XhVRRDQnOGvf2wdJfyQvc6qrE+sPvfOLAxu8Zfd3TLyIYSaOQrQkYHYVgjvP3V6bDLVawzkL4bgzMwA9ZjXvkRNbXFSx1IDSdZnHFEmvd6szUa+iaRakxw8G7nJFgvIUez9bMQq3tOFEvuO07DUoOcFeNEVTQejoV0xXfABpdqXi6Kf3fhqSoVe+STU+oYdccQZpmHD2CAxUSTJIxERsvr9bTy+y8Vtw6X6ECDcJtp+QrH2tCjexC5SfDvqL4HzhY1EXHWZZT0wDfemEjTH7oCXqy9PkIge3HR2rfmdI8fXi7EiU9ktqQ/QoQlsYaavkGz6nb/Lkruo8yFPdhX2gbNQ+i6vn+U2djF3hIj4ps+ePPVJiCkXA4/LfcPR35s/DWJ9807FP+HRMvlIuzhd5hYdboBlYp+PePRVd6Cq2rE57hMiCZNN8sKf5GD2vRcbbcIx6c2gyIh6L4NWuIeqV43E1QEATe4rivL802JD9/3zUN7crKflg3/bdKNKcs3DoEhikc7MhCuJvYRl+1VzIguQXf8pPYsbp540Ssid1c9vap9wBHUEeXDiGSUbOEgwG+5fEQw1pPANzs949Qr/okXoQYPwi7V0fXLREjea6BcSpH4zl1yLp3/XM3Ys1Wuw8TwhGk/wPwcao9C54ndkU3NQvuwDPUFDfYLR4YMNN7K3EEeBZ4Qq3uol1dIokqEs8ZWCdbteah2fBPGEJK+vhDBOXkpBM4VUs= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 547dd2be-36cc-4367-3f86-08da1931a45a X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2022 07:30:22.9378 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: v6kE/SPiZeyKJeek/yQ7r+QW1RIkW0ZBBwm+yNchiuk8quGQpwhSxMLkf7Fs1Jww59KRpITn4x0Z26kX85IMgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB5919 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 Apr 2022 17:09:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96472 From: Stefan Herbrechtsmeier The sed commands to link with libatomic don't match and is therefore useless. If they are really needed the problem should be fixed in the code for example with CHECK_LIBRARY_EXISTS. Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v1) meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb b/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb index 292ea7f9b..7275f451a 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb +++ b/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb @@ -59,26 +59,6 @@ do_configure:prepend() { sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt } -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:powerpc() { - 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:riscv64() { - 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:riscv32() { - 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" FILES:${PN}-compiler += " \