From patchwork Wed Mar 29 10:08:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiangyu Chen X-Patchwork-Id: 21891 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 AB2E2C74A5B for ; Wed, 29 Mar 2023 10:08:44 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.20769.1680084516003055013 for ; Wed, 29 Mar 2023 03:08:36 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=34523aef51=xiangyu.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32T9wHq8012379 for ; Wed, 29 Mar 2023 10:08:35 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3php644nka-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 29 Mar 2023 10:08:35 +0000 Received: from m0250811.ppops.net (m0250811.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 32TA4vWR028253 for ; Wed, 29 Mar 2023 10:08:34 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2177.outbound.protection.outlook.com [104.47.73.177]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3php644nk7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 29 Mar 2023 10:08:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eqMZB8T5iTnYpjHejaOw1M7vRKjrDdMwZ4NGHwk1qcQ7FNKgUCX1k2Vb1bGDZ35INMZrRRPA7ckMmUnkcKOdCrnl6E2FALMwjrAhRfrFMa5d9/Z5FlDHUByBQs8RDGabqDY222dA/tMwcGOxmJ80c194+SHC6O9YmrSKVXKrmZqFsoVh8hf2r7EEG7N0QWlK1PKSyQdyxv/Z+mY2ORdmbtRUEi8ecpey+j2ZtcO+mqWnm2U/g/pUJ83uBGsfP1Y70l8FRqVw3YLvt/3/Am00VmJZal7miEX+HpDrWOfBjrOQ57ijFSMZ/EQDOrIV+xJ889xMVn9aWX5hgfJfX1WVKA== 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=QXla3TXP+Pseh6R2GDLIDF4avGpX4ZnG2E5v4j1peVY=; b=ecwjjN/XXC2fS6jsgQc9O96f92HjAeMrKA+6f7H1005UA4iqbNuvHRdB9+TLdKkIXWhGsH8VLqVLFPyIZvBc3BL5V+s004aPiAcIkidFw6LUfui6IEZHreVVj4O5hX0P5E8Kp5KLDx3sfrUEAfR3fhfN+sNaMyctGIbN/5dJh9i7eqf9q5KsIk8um4Ex13iCNEcn7PZ5YMTFoLqXWlDW1qUR8W9YpDvbMJfQE2Vmw4OgdkFFqPRatx2ryfHBcTwqel4T7w7StgnAyPmTWf5SKwooJ4nrONnTvZTNYg7f9yzGBLMsetiLydXbZOsDItMgFB4/rHtUki/hekiCx0oKsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=eng.windriver.com; dkim=pass header.d=eng.windriver.com; arc=none Received: from MW4PR11MB5824.namprd11.prod.outlook.com (2603:10b6:303:187::19) by SN7PR11MB6726.namprd11.prod.outlook.com (2603:10b6:806:266::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.35; Wed, 29 Mar 2023 10:08:29 +0000 Received: from MW4PR11MB5824.namprd11.prod.outlook.com ([fe80::2ece:f831:c97b:dd8e]) by MW4PR11MB5824.namprd11.prod.outlook.com ([fe80::2ece:f831:c97b:dd8e%6]) with mapi id 15.20.6222.028; Wed, 29 Mar 2023 10:08:29 +0000 From: Xiangyu Chen To: raj.khem@gmail.com, openembedded-devel@lists.openembedded.org Subject: [oe][meta-oe][PATCH v3 1/3] protobuf: upgrade 3.21.12 -> 4.22.2 Date: Wed, 29 Mar 2023 18:08:08 +0800 Message-Id: <20230329100810.705855-2-xiangyu.chen@eng.windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230329100810.705855-1-xiangyu.chen@eng.windriver.com> References: <20230329100810.705855-1-xiangyu.chen@eng.windriver.com> X-ClientProxiedBy: TYCP301CA0007.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::18) To MW4PR11MB5824.namprd11.prod.outlook.com (2603:10b6:303:187::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW4PR11MB5824:EE_|SN7PR11MB6726:EE_ X-MS-Office365-Filtering-Correlation-Id: 6bcdb631-3e26-4bd8-c50b-08db303d8a99 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: boJQvuCuxV+Ows20aIOU7dkjqu7MPYkG761T1T8kURy3rIT4E7qZ1x9RSohM+t93MbOSNMJpuaO3vdUrzhwYQA7ZNnQcC5kdqjmLXqNd8uRmhFGxOjPSpHRlPvRQb1MV340B33hOw9tglu1RqXzxCBnxbZ0ZatQIAk9T8SHY2hqjQygizEZYX2ko16Js2327irhOOtyA+F2v4u9AFZFZnytCdBS6ZKcKrcO9wRP6I3a+jx2n/2/nmLB9Pxpsnul/nbL6/6QOggs1x9lB/JkcgZVP6cFJwUw/Jf1wlIb4D6LtuvJxSOsi71zpiZyrzFWWNBR89vtnnZyGQbVKro9UTIzGrvTTxLnofE8zgyMNv+5WCLmyHIpZbuTtIaofQkR1YP5/2tY3vOPQNTj9AoEkboC8gxdC9fquBoXQcwcNsYGgh7Uze7pHUjEefEn/i+CxEE90vF/wI8ZycahNzxbHHHilwVLfu4i2SoXOJUcR/d7Rm1FAPLT6Cz/J72D5jNg0nHXEsT1f22tO8lA69XB67Ra+tjwdSoljmb/eaEbLDK52mBefKaeQ9sScyLZMqqcpomUVDvLiak9YrA2kRMxJuT5t6LCpHgydC1oPHGXjpOFu1DEDrq8eI0innA64j9ep X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR11MB5824.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(346002)(39850400004)(366004)(376002)(396003)(451199021)(83380400001)(6666004)(26005)(1076003)(478600001)(83170400001)(52116002)(316002)(6506007)(6512007)(8676002)(66476007)(66556008)(66946007)(41300700001)(2616005)(6486002)(38350700002)(38100700002)(8936002)(44832011)(5660300002)(2906002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LB4X8VpTTYaGVI/MD60gPl/SxPo2Hi0fL0YOHOD+n/uoouusQLf8z36uSQb/iYDdOUIg5Y1TfWprrI71aKbf5ua+LCgizoBYaYm9bji/PZDSebT9OdeIyW4htF2lwFv63rELZunlc7MMtsH/L3JYfn7CJARHeUKGbwP2+SECAIcw1/aISTtwbnv9xPjborKsPAuc96cSs9xUfAo+79hMEgekO5E6mqJ7a+qvj5hUxm/CyG5VsGySf2d5Hxy1JYNkDBuo01GI4elNhZTqI3DM72bAm0t3LQbLwUqaDdvSC/gK17NvTySpecx0iIEyIvJqGuDuFs9uI1oqN5KUzmSKVTHQ8xDuaShN28cKeWJp31dC1x3YY8mZBf3sU7PLqLB6gud4iuCH0VrVF6BvR1XrRRGPsCj4zF6DxO2RHb/cyitAjugsTvmtyfwimzBEIB5a+AIeUgqYP9BLmD48eb/MOD98TOBzf9FJjKN8NlaqdNC6Yjpa5Ek8orxUKOV30Xfwnr7YkPtGOQbJi+c832CS/7l8WPC/VI0R+4E4u71Oik/xN+4OehV+H98fax+MIbkbh+n4OpB9HJ/y8SOIKDJ7qzfFERsygtE3kHrAUaeE8N+H7KB/sIoLFxM1F0qj4jqX5v/X+c63+JqaDtnewNU4yOo4YShBIf1ax4G0QRRx89cYQ9Py2xj9GtWA+hOCFc0vB4vjB/oLvCfskjMZtMfZgT84gy7dTJhasYHY1YqRQNFkZ8OLZ1kuviTHiJdl1AQyiL6fy1dHKyPgh5TM34w7b9uOvuH+ltBKLpMyIPsCW/9+5ja7Dyp+q2gswgq0ETGzB/EYcFhUUjSo+ETT/HOgRj8OXp/lSPOaQWc7HPskO8NmXGbrAGE6Z5qZjLowqP0rLzXuEFu8gPzbti8qxnRPf0Xw+ZSxyKkPvrcDGmTrl5Xl04yJZ3U7EWf/aZ46D7QQeluENrMiXoB0HBnKZHSZoQnMtA1DGJzKdqzNo3WBerB+fqkZ6aOUnnZ9cy7PF6uVksvhr6YASmcZnl6AOx7i7eFrqE2v+dHapeqhcp/MxGWbr0+EMpBBs/6E9pRIfzZTG2xadsQ2NTKMXxBIaBDlhPLax+zE/mcO3rYaYH5tIZYEgyLQ3v0KEOqIxW/xARdCDLKC7A/83jV15K6S0ki8WiIvnHT0kkEiwzomjUMIi98Bqqm+++tRHr9eKIG5UlwfA9DPtd6ECzFwlh51TLkw9OKz+M1dIuyzuW6lks6qX2fDW6ySaf9wMWvTK2CDGvgybHFTEP0aoO0XivBlagRTRZndjxFHelv67LK3rAEAwDNWwoV423IG9u2faAcoKfkVpAy94jX1jf8K+1pV8l+xXHtsijC+bETG/c15bddkeks9tyWxIBOKwZGD1LvgvQDdyF/g92bqk2+PAQ4Y8Q1FhmXv7URWOPYXnSI6LJFXlBUsmNSW6qz+UN+mhSkm2RipiC3VxOsPsSsbbjJkVA97h9baEXlUIXPRCrf+bCMA2uaBoZf9GjQGZ+e8PwDHzPRwfpAhMrdmb//+p4T5eSmPk5xVMxR63QkPHOh7+LxCsgXLu/VHP/nKV9H6KF3YhvOBgTMw0gBFcEtQ6EAZRka4qg== X-OriginatorOrg: eng.windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bcdb631-3e26-4bd8-c50b-08db303d8a99 X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5824.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2023 10:08:28.1513 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YHlmj0owOAzVRWCnHJbX4YqTYKBW34KI9CX9Uooso5R1n8ZpF5Ms9FwN2WmkQVlJ4U2vAb3U0VTFug9UKpP/uvxeeFlzxKOW1QTf/t+jGUQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6726 X-Proofpoint-ORIG-GUID: 24zqr30ErX5r4GzN_yDv1f9EgdCzzANP X-Proofpoint-GUID: FKsuiGG8fGb1U7s5RxQo4-0rOqkViujd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-29_04,2023-03-28_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 priorityscore=1501 lowpriorityscore=0 clxscore=1015 mlxscore=0 adultscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303290084 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 ; Wed, 29 Mar 2023 10:08:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101814 From: Xiangyu Chen Signed-off-by: Xiangyu Chen --- ...efile-respect-CXX-LDFLAGS-variables-fix-.patch | 15 +++++++++------ .../{protobuf_3.21.12.bb => protobuf_4.22.2.bb} | 11 ++++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) rename meta-oe/recipes-devtools/protobuf/{protobuf_3.21.12.bb => protobuf_4.22.2.bb} (86%) diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch index 36c3c597a..7c4bf260e 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch +++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch @@ -30,7 +30,7 @@ Signed-off-by: Leon Anavi 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index 1c7ec8d63..85f591231 100644 +index ef7a4ef58..7206e14e1 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -2,6 +2,8 @@ @@ -42,17 +42,20 @@ index 1c7ec8d63..85f591231 100644 all: cpp java python cpp: add_person_cpp list_people_cpp -@@ -40,11 +42,11 @@ protoc_middleman_dart: addressbook.proto +@@ -41,11 +43,11 @@ protoc_middleman_dart: addressbook.proto add_person_cpp: add_person.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ -std=c++11 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp +- c++ -std=c++14 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp #$(CXX) -std=c++17 $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp list_people_cpp: list_people.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ -std=c++11 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp +- c++ -std=c++14 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp #$(CXX) -std=c++17 $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp add_person_dart: add_person.dart protoc_middleman_dart +-- +2.34.1 + diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb b/meta-oe/recipes-devtools/protobuf/protobuf_4.22.2.bb similarity index 86% rename from meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb rename to meta-oe/recipes-devtools/protobuf/protobuf_4.22.2.bb index 343933033..0c6b446dc 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_4.22.2.bb @@ -7,12 +7,12 @@ SECTION = "console/tools" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" -DEPENDS = "zlib" +DEPENDS = "zlib abseil-cpp" DEPENDS:append:class-target = " protobuf-native" -SRCREV = "f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c" +SRCREV = "81f89d509d6771dcccb619cbe26ac86cec472582" -SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=21.x;protocol=https \ +SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=22.x;protocol=https \ file://run-ptest \ file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ file://0001-Fix-linking-error-with-ld-gold.patch \ @@ -35,6 +35,7 @@ EXTRA_OECMAKE += "\ -Dprotobuf_BUILD_LIBPROTOC=ON \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_BUILD_EXAMPLES=OFF \ + -Dprotobuf_ABSL_PROVIDER="package" \ " TEST_SRC_DIR = "examples" @@ -52,7 +53,11 @@ do_compile_ptest() { cp ${S}/${TEST_SRC_DIR}/Makefile "${B}/${TEST_SRC_DIR}/" sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Cflags:|Cflags: -I${WORKDIR}/recipe-sysroot-native${includedir} |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" sed -e 's|Libs:|Libs: -L${B}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Libs:|Libs: -L${WORKDIR}/recipe-sysroot-native/usr/lib|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Libs:|Libs: -labsl_log_internal_check_op |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Libs:|Libs: -labsl_log_internal_message |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" # Until out-of-tree build of examples is supported, we have to use this approach sed -e 's|../src/google/protobuf/.libs/timestamp.pb.o|${B}/CMakeFiles/libprotobuf.dir/src/google/protobuf/timestamp.pb.cc.o|' -i "${B}/${TEST_SRC_DIR}/Makefile" export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}" From patchwork Wed Mar 29 10:08:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiangyu Chen X-Patchwork-Id: 21892 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 B18B9C6FD18 for ; Wed, 29 Mar 2023 10:08:44 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.20732.1680084516458938246 for ; Wed, 29 Mar 2023 03:08:36 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=34523aef51=xiangyu.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32TA7vKw002201 for ; Wed, 29 Mar 2023 10:08:35 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3php644nkc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 29 Mar 2023 10:08:35 +0000 Received: from m0250811.ppops.net (m0250811.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 32TA4vWT028253 for ; Wed, 29 Mar 2023 10:08:35 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2177.outbound.protection.outlook.com [104.47.73.177]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3php644nk7-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 29 Mar 2023 10:08:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yzkd4E+yh+zf61k9kG/8jCgsCICQz1+5D+ekfI0JZRWHyoRXl/tghvIgYn3fgsJE6BlvCxgoGkeeh79CLxvHEFHuvz0yj7w1QtWpUhXcPR9G3RqfLGg6KZPq3x6xwyYIUIzYWdy5Dn9IB8UrLb7Ds9WqsXbsoQcHZ+v1jmuNlSaVUyy8CyJbFIL9rmQ/A730IERadfj4YCdH3FEqc7K7PootwLZu7h8jHxIGm1MLpPQI7O+Olhk1Ylub4K7j25ZX2UYNGtb/KxHQkWAJgKbf0EHr+FRqeizRjxk/K+A8qNT1/4YsYO6uJI/GfGAtxhn/Q4GWHRGBCLlbLUT6L9ACHg== 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=4+Oc8CkknwVqS2ZgrCctP9K5H/P7hizJe2Y0MzW1IAU=; b=WgUmajjVpscLRLTC9L0tYufBEsgjwwpO4ySxZJmp55G/MgktXjv2V1jiB56tjlWooY6qnYmmRVs/iNEIho7ImRL7l0RiUYE2lRH4hs6RPBh71WNieeonfxAR3VD2U7Y4IipHKrETE190aRGWya99USk8AX0Z+dL1Gia/ZYOKMAA2HWl9RTYdUL3X4zQX/P6UH/huXujkADIRhNAywLoYWPR4HCv7AazumoiFbQ/6LHmdhQ0eUMlnuGbQDbCit3Udgh0/a6mZuXq/VW6wVNfghw245xrm8WfGoHDSe6o+Q4+WkRtNF5TrWtfGukq7veO+YEC+drjZFwvvtzJyqSMmtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=eng.windriver.com; dkim=pass header.d=eng.windriver.com; arc=none Received: from MW4PR11MB5824.namprd11.prod.outlook.com (2603:10b6:303:187::19) by SN7PR11MB6726.namprd11.prod.outlook.com (2603:10b6:806:266::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.35; Wed, 29 Mar 2023 10:08:29 +0000 Received: from MW4PR11MB5824.namprd11.prod.outlook.com ([fe80::2ece:f831:c97b:dd8e]) by MW4PR11MB5824.namprd11.prod.outlook.com ([fe80::2ece:f831:c97b:dd8e%6]) with mapi id 15.20.6222.028; Wed, 29 Mar 2023 10:08:29 +0000 From: Xiangyu Chen To: raj.khem@gmail.com, openembedded-devel@lists.openembedded.org Subject: [oe][meta-oe][PATCH v3 2/3] protobuf-c: add support of protobuf 4.22.x Date: Wed, 29 Mar 2023 18:08:09 +0800 Message-Id: <20230329100810.705855-3-xiangyu.chen@eng.windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230329100810.705855-1-xiangyu.chen@eng.windriver.com> References: <20230329100810.705855-1-xiangyu.chen@eng.windriver.com> X-ClientProxiedBy: TYCP301CA0007.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::18) To MW4PR11MB5824.namprd11.prod.outlook.com (2603:10b6:303:187::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW4PR11MB5824:EE_|SN7PR11MB6726:EE_ X-MS-Office365-Filtering-Correlation-Id: 3bff2019-07af-445c-b31c-08db303d8b53 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Pn74tigUy0lOucYoCPzhctr0XV2cB0kGJnpKmUCcc8x7NFU8PFf4r0JPyLkl11T8ngQ8RAssIFzVRdSkBrjpBNudIXyU4Ht76iTHWinKLNYSa2UPMKiw3JQAP8sV0i8Bx30vt0KXtQowk/Nf6CX+AvzVxtInYeN+CGOS0MAhg/lMBMFO0n5irBn2SwB5jm26BuA82BY1JX5ZjJAPe3VRzf+By0SVnKxLty9uwanLXTC4ZbEXwyM7h+7gHsHkMh4K0hAMzUBceP7W4R5sjD6PiwqoH9D+xUVV/dyWLO7qhyy0PDfIVSLaZizG33nVODCB5XBSuuRpo5Pbzl3lCinoz7AJ7o3uF+4qV91vfcJ0tD04l+LzV7XKWH8PHlp5PCcKX3DVNN4EZUq4CAdxWQqZU8z9+MYJHKut74G/jUcPnzjAjoRou7t4ujUwNyuUFAWJx6Hl/75qvNsOWoqC9tttoecAnXYZTQbWY5EbKhryKZRZHbNZJoW/l3KXQ16GuBXUkny8PcOnFoapfhEbIQzHgwpafjpgt4UJz67SD08BAAuEzty+hJwn/cWLWZa/sOLrJvRglL6i6E96HjhvpQ0TmPr7N3qA8a6pUNLEnXmn4TM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR11MB5824.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(346002)(39850400004)(366004)(376002)(396003)(451199021)(83380400001)(6666004)(26005)(1076003)(478600001)(83170400001)(52116002)(316002)(6506007)(6512007)(8676002)(66476007)(66556008)(66946007)(41300700001)(2616005)(6486002)(38350700002)(38100700002)(30864003)(8936002)(44832011)(5660300002)(2906002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9PKrKtcpH7UZys3TSgPE+KqvvmqL7IdwB03Ky9fx0LCmvLumm0MUi9YTh6ddwjbFhbg0WR3IzsFAPfhUqJryC+xtqy0+lGOEot5YicpNLJZLCzqCIsDuI++1IxaCDxRMKPMRTBixKvNqSB4PgGG855wln30Ahzx4lEMb/54Iri3ZeIOqV7lfQ/qWepSHbF8eXYBHVdqQeX4IG5TOJDDGbp0y1cFQArMnLWABK3Gb2vYgdCVhHQqFvYa31qDx8K/yzs3dEz6DzEqMGjIDiwkpVZoX7nGGlUcofDtW7+Wyy5dtSRzT09027NZU5LuypzeYjNT1CTqoPq2oLIYuHUchvUpvQxvDAo6Tua4IS/GJKbFzmJtLvSsrv70PzqSzJ7qv2HLHlg19yiFKg+hXUq4Pr8Vppve5E8Y8a5KS8n5PrwfPUI75Zmv2/5/lQmSk+8rAUTkDnTKB9u9wqA0bA6Y/Pf/MmICTBW+cZj9goenM0IREn842QIofdnOioJaGsynpSkKAR5DiLwcY1wlR7X7/PFjphwoXOpttF9ejIFewzsjP8y/JBR0cwv8IGkJUZKsCfRdsZsyjll2SNNXyF6BhJsM7CCcv4XMvZlbCs2htmGKZwGkMn2MD43YFG7ONPRaCWe8UJtEbwX1DcXgrHnG9FTyGneEfGBCGaYnqQaR4B82TJBpbP7wriZMIKqvLilv/oLpE5QB1RQuhPNNr3B9zY/NFJ187qTsuZwkU6emRmDWvkir5cSShox/vFmxnRlor3dkC8Af0T3sgSuzhMI/F5BaF196fsCemCPL/dDTUJ6nOc15rYTXGwm5LnS55SyBGlc5mesDi6CQJanwYbIte7IGFTHlUx+nQ637FEl7MkDD14oMLzDjW1QPjavUXC00IwoEGtrMiaIlA9xsVxPQWOFe1MwBvK60Dwl/hdiTBJMDdcaOkjeLS2Bou1wQpSW4jz5J7+XUoE+tNm2Amn68TBdTYR3vSxRRB7Dtns10ypnWsR++TMw/wDq16U2TEmWdZoEkxcBSCKtwsNQnZ3tz2fnY7yrr3TgQsxIR0GtmeYbNdrgB4uO+bFDSVPLT4H7kvvZP+U0gpdlQE0hPqzcKT5PllbAiEUOhXBaWKFPpCCohj/Qkhz97fxH0G0Szlh1Q1hP3BzTm36nl3KWwPgLkI3b3hoFFuDzEbr3f5A34+1Hcr2lSuKXDpDhBwfxB26svuIkZYB2Tkp6nBkJCAH4exmT9RxvBDQYXsu2gCxl6G0NxZsj8u43b4ePVmrvxFYsFc3zUv/qoy9UaaGvJJjGxFsHVKm3krRWigHTu6ClpBphVpCOj2KjgzqCU+lCm3G6YM3jcLV3r/FR9jWhIVln+eIlVdfonPlosF5FAzxpAYhaLr+5GhIJUg0+bXL/upB6mT0QvPozT7JM4XT59vF5j/rwMuUnXzA/m+gZdnkO5Fkl96A4o789+Y3+sPLYH1LD1qRfn1RdmxRqZkOHNp8W9KlK3Vh2q21yODcnQLtdm9d2fvRZVWnpXi/DT/cfrhSBfhYB4Q2/BQqSuHTkyOhmfzewFnPtU3CYigG0dK92ZZLa2ZuZKBzLHIhpbuDOw3t9zO4/8UaPWPw1wQVDdeM7xs5w== X-OriginatorOrg: eng.windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3bff2019-07af-445c-b31c-08db303d8b53 X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5824.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2023 10:08:29.4481 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nedvYBnHMXAGtf7o7qKBP/T1Do08qqTwqwBvMp7f/2ENYYs3I9Xf6ehyj9WNpNhc15r+ydBWyKwKYnhPxaMtUAgYRKnTiidSkk+JssTiXXw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6726 X-Proofpoint-ORIG-GUID: ERQqJLNR60srQyaTi2lu07DIDszUTL4F X-Proofpoint-GUID: rjjtZQt_2KJJBJuiFzDL3cweFWjNrF7m X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-29_04,2023-03-28_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 priorityscore=1501 lowpriorityscore=0 clxscore=1015 mlxscore=0 adultscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303290084 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 ; Wed, 29 Mar 2023 10:08:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101815 From: Xiangyu Chen Signed-off-by: Xiangyu Chen --- .../0001-add-support-of-protobuf-4.22.x.patch | 315 ++++++++++++++++++ .../protobuf/protobuf-c_1.4.1.bb | 5 +- 2 files changed, 319 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c/0001-add-support-of-protobuf-4.22.x.patch diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-add-support-of-protobuf-4.22.x.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-add-support-of-protobuf-4.22.x.patch new file mode 100644 index 000000000..075b7044c --- /dev/null +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-add-support-of-protobuf-4.22.x.patch @@ -0,0 +1,315 @@ +From 66a0b0d205224f63f19dd8f96abf9dcdc2112331 Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen +Date: Wed, 29 Mar 2023 14:25:17 +0800 +Subject: [PATCH] add support of protobuf 4.22.x + +after upgrade the protobuf to 4.22.x, the protobuf-c cannot compile anymore (#544) due to following changes: +1.protobuf using c++14, that cause the command_line_interface.h report error +2.protobuf using abseil-cpp library instead the trace API with GOOGLE_ header +3. removed GOOGLE_DISALLOW_EVIL_CONSTRUCTORS + +Upstream-Status: Pending [https://github.com/protobuf-c/protobuf-c/pull/548] + +Signed-off-by: Xiangyu Chen +--- + Makefile.am | 2 +- + configure.ac | 8 ++++++++ + protoc-c/c_bytes_field.h | 1 - + protoc-c/c_enum.h | 1 - + protoc-c/c_enum_field.h | 1 - + protoc-c/c_extension.h | 1 - + protoc-c/c_field.cc | 2 +- + protoc-c/c_field.h | 3 --- + protoc-c/c_file.h | 1 - + protoc-c/c_generator.h | 2 -- + protoc-c/c_helpers.cc | 4 ++-- + protoc-c/c_message.cc | 4 ++-- + protoc-c/c_message.h | 1 - + protoc-c/c_message_field.h | 3 --- + protoc-c/c_primitive_field.cc | 6 +++--- + protoc-c/c_primitive_field.h | 3 --- + protoc-c/c_service.h | 1 - + protoc-c/c_string_field.h | 1 - + 18 files changed, 17 insertions(+), 28 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c7339ef..3b0d1d6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,7 +20,7 @@ AM_CPPFLAGS = \ + -I${top_builddir} \ + -I${top_srcdir} + AM_CFLAGS = ${my_CFLAGS} +-AM_LDFLAGS = ++AM_LDFLAGS = ${ABSL_LOG_INTERNAL_CHECK_OP_LIBS} ${ABSL_LOG_RAW_HASH_SET_LIBS} + + # code coverage + +diff --git a/configure.ac b/configure.ac +index f5a0261..8ed549a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -78,6 +78,14 @@ if test "x$enable_protoc" != "xno"; then + + AX_CXX_COMPILE_STDCXX(11, noext, mandatory) + ++# now checking 4.22.x protobuf, if so, set cxx as 14 ++ AS_IF([pkg-config --atleast-version 4.22.0 protobuf],[AX_CXX_COMPILE_STDCXX(14, noext, mandatory)]) ++ ++ AS_IF([pkg-config --atleast-version 4.22.0 protobuf], ++ [PKG_CHECK_MODULES([ABSL_LOG_INTERNAL_CHECK_OP], [absl_log_internal_check_op], ++ [PKG_CHECK_MODULES([ABSL_LOG_RAW_HASH_SET], [absl_raw_hash_set], [], [AC_MSG_ERROR([Missing absl_raw_hash_set library.])])], ++ [AC_MSG_ERROR([Missing absl_log_internal_check_op library.])])]) ++ + PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0], + [proto3_supported=yes], + [PKG_CHECK_MODULES([protobuf], [protobuf >= 2.6.0])] +diff --git a/protoc-c/c_bytes_field.h b/protoc-c/c_bytes_field.h +index bf873f0..8fc63d3 100644 +--- a/protoc-c/c_bytes_field.h ++++ b/protoc-c/c_bytes_field.h +@@ -88,7 +88,6 @@ class BytesFieldGenerator : public FieldGenerator { + private: + std::map variables_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(BytesFieldGenerator); + }; + + +diff --git a/protoc-c/c_enum.h b/protoc-c/c_enum.h +index 9c34b69..d5e58f0 100644 +--- a/protoc-c/c_enum.h ++++ b/protoc-c/c_enum.h +@@ -107,7 +107,6 @@ class EnumGenerator { + const EnumDescriptor* descriptor_; + std::string dllexport_decl_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_enum_field.h b/protoc-c/c_enum_field.h +index 3f8c005..03eb402 100644 +--- a/protoc-c/c_enum_field.h ++++ b/protoc-c/c_enum_field.h +@@ -86,7 +86,6 @@ class EnumFieldGenerator : public FieldGenerator { + private: + std::map variables_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumFieldGenerator); + }; + + +diff --git a/protoc-c/c_extension.h b/protoc-c/c_extension.h +index 9541388..9c5797d 100644 +--- a/protoc-c/c_extension.h ++++ b/protoc-c/c_extension.h +@@ -99,7 +99,6 @@ class ExtensionGenerator { + std::string type_traits_; + std::string dllexport_decl_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_field.cc b/protoc-c/c_field.cc +index 0716744..4abdc6d 100644 +--- a/protoc-c/c_field.cc ++++ b/protoc-c/c_field.cc +@@ -231,7 +231,7 @@ FieldGeneratorMap::~FieldGeneratorMap() {} + + const FieldGenerator& FieldGeneratorMap::get( + const FieldDescriptor* field) const { +- GOOGLE_CHECK_EQ(field->containing_type(), descriptor_); ++ ABSL_CHECK_EQ(field->containing_type(), descriptor_); + return *field_generators_[field->index()]; + } + +diff --git a/protoc-c/c_field.h b/protoc-c/c_field.h +index 3cad35d..76d3b0b 100644 +--- a/protoc-c/c_field.h ++++ b/protoc-c/c_field.h +@@ -104,8 +104,6 @@ class FieldGenerator { + const std::string &descriptor_addr) const; + const FieldDescriptor *descriptor_; + +- private: +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGenerator); + }; + + // Convenience class which constructs FieldGenerators for a Descriptor. +@@ -122,7 +120,6 @@ class FieldGeneratorMap { + + static FieldGenerator* MakeGenerator(const FieldDescriptor* field); + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap); + }; + + } // namespace c +diff --git a/protoc-c/c_file.h b/protoc-c/c_file.h +index 8dfd8ba..ec55906 100644 +--- a/protoc-c/c_file.h ++++ b/protoc-c/c_file.h +@@ -104,7 +104,6 @@ class FileGenerator { + std::unique_ptr[]> service_generators_; + std::unique_ptr[]> extension_generators_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_generator.h b/protoc-c/c_generator.h +index ac1ffaf..9260116 100644 +--- a/protoc-c/c_generator.h ++++ b/protoc-c/c_generator.h +@@ -94,8 +94,6 @@ class PROTOC_C_EXPORT CGenerator : public CodeGenerator { + OutputDirectory* output_directory, + std::string* error) const; + +- private: +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_helpers.cc b/protoc-c/c_helpers.cc +index 6fd0cd3..1eaeeb4 100644 +--- a/protoc-c/c_helpers.cc ++++ b/protoc-c/c_helpers.cc +@@ -286,7 +286,7 @@ const char* const kKeywordList[] = { + + std::set MakeKeywordsMap() { + std::set result; +- for (int i = 0; i < GOOGLE_ARRAYSIZE(kKeywordList); i++) { ++ for (int i = 0; i < ABSL_ARRAYSIZE(kKeywordList); i++) { + result.insert(kKeywordList[i]); + } + return result; +@@ -548,7 +548,7 @@ std::string CEscape(const std::string& src) { + std::unique_ptr dest(new char[dest_length]); + const int len = CEscapeInternal(src.data(), src.size(), + dest.get(), dest_length, false); +- GOOGLE_DCHECK_GE(len, 0); ++ ABSL_DCHECK_GE(len, 0); + return std::string(dest.get(), len); + } + +diff --git a/protoc-c/c_message.cc b/protoc-c/c_message.cc +index 37e8bf8..c7e8515 100755 +--- a/protoc-c/c_message.cc ++++ b/protoc-c/c_message.cc +@@ -499,7 +499,7 @@ GenerateMessageDescriptor(io::Printer* printer, bool gen_init) { + // NOTE: not supported by protobuf + vars["maybe_static"] = ""; + vars["field_dv_ctype"] = "{ ... }"; +- GOOGLE_LOG(DFATAL) << "Messages can't have default values!"; ++ ABSL_LOG(FATAL) << "Messages can't have default values!"; + break; + case FieldDescriptor::CPPTYPE_STRING: + if (fd->type() == FieldDescriptor::TYPE_BYTES || opt.string_as_bytes()) +@@ -521,7 +521,7 @@ GenerateMessageDescriptor(io::Printer* printer, bool gen_init) { + break; + } + default: +- GOOGLE_LOG(DFATAL) << "Unknown CPPTYPE"; ++ ABSL_LOG(FATAL) << "Unknown CPPTYPE"; + break; + } + if (!already_defined) +diff --git a/protoc-c/c_message.h b/protoc-c/c_message.h +index ea1c3ab..e90782b 100644 +--- a/protoc-c/c_message.h ++++ b/protoc-c/c_message.h +@@ -137,7 +137,6 @@ class MessageGenerator { + std::unique_ptr[]> enum_generators_; + std::unique_ptr[]> extension_generators_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_message_field.h b/protoc-c/c_message_field.h +index 39b8d99..42efe36 100644 +--- a/protoc-c/c_message_field.h ++++ b/protoc-c/c_message_field.h +@@ -83,9 +83,6 @@ class MessageFieldGenerator : public FieldGenerator { + std::string GetDefaultValue(void) const; + void GenerateStaticInit(io::Printer* printer) const; + +- private: +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator); + }; + + +diff --git a/protoc-c/c_primitive_field.cc b/protoc-c/c_primitive_field.cc +index 6990893..d5a7b60 100644 +--- a/protoc-c/c_primitive_field.cc ++++ b/protoc-c/c_primitive_field.cc +@@ -99,7 +99,7 @@ void PrimitiveFieldGenerator::GenerateStructMembers(io::Printer* printer) const + case FieldDescriptor::TYPE_STRING : + case FieldDescriptor::TYPE_BYTES : + case FieldDescriptor::TYPE_GROUP : +- case FieldDescriptor::TYPE_MESSAGE : GOOGLE_LOG(FATAL) << "not a primitive type"; break; ++ case FieldDescriptor::TYPE_MESSAGE : ABSL_LOG(FATAL) << "not a primitive type"; break; + + // No default because we want the compiler to complain if any new + // types are added. +@@ -143,7 +143,7 @@ std::string PrimitiveFieldGenerator::GetDefaultValue() const + case FieldDescriptor::CPPTYPE_BOOL: + return descriptor_->default_value_bool() ? "1" : "0"; + default: +- GOOGLE_LOG(DFATAL) << "unexpected CPPTYPE in c_primitive_field"; ++ ABSL_LOG(FATAL) << "unexpected CPPTYPE in c_primitive_field"; + return "UNEXPECTED_CPPTYPE"; + } + } +@@ -197,7 +197,7 @@ void PrimitiveFieldGenerator::GenerateDescriptorInitializer(io::Printer* printer + case FieldDescriptor::TYPE_STRING : + case FieldDescriptor::TYPE_BYTES : + case FieldDescriptor::TYPE_GROUP : +- case FieldDescriptor::TYPE_MESSAGE : GOOGLE_LOG(FATAL) << "not a primitive type"; break; ++ case FieldDescriptor::TYPE_MESSAGE : ABSL_LOG(FATAL) << "not a primitive type"; break; + + // No default because we want the compiler to complain if any new + // types are added. +diff --git a/protoc-c/c_primitive_field.h b/protoc-c/c_primitive_field.h +index a9eb893..d2bb724 100644 +--- a/protoc-c/c_primitive_field.h ++++ b/protoc-c/c_primitive_field.h +@@ -83,9 +83,6 @@ class PrimitiveFieldGenerator : public FieldGenerator { + std::string GetDefaultValue(void) const; + void GenerateStaticInit(io::Printer* printer) const; + +- private: +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(PrimitiveFieldGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_service.h b/protoc-c/c_service.h +index 27125a6..4737ff3 100644 +--- a/protoc-c/c_service.h ++++ b/protoc-c/c_service.h +@@ -101,7 +101,6 @@ class ServiceGenerator { + const ServiceDescriptor* descriptor_; + std::map vars_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_string_field.h b/protoc-c/c_string_field.h +index 513cea7..ba258e4 100644 +--- a/protoc-c/c_string_field.h ++++ b/protoc-c/c_string_field.h +@@ -88,7 +88,6 @@ class StringFieldGenerator : public FieldGenerator { + private: + std::map variables_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringFieldGenerator); + }; + + +-- +2.34.1 + diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb index d724287d6..bdaf43a54 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb @@ -12,7 +12,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9f725889e0d77383e26cb42b0b62cea2" DEPENDS = "protobuf-native protobuf" -SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https" +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https \ + file://0001-add-support-of-protobuf-4.22.x.patch \ + " + SRCREV = "abc67a11c6db271bedbb9f58be85d6f4e2ea8389" S = "${WORKDIR}/git" From patchwork Wed Mar 29 10:08:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiangyu Chen X-Patchwork-Id: 21893 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 B4440C77B60 for ; Wed, 29 Mar 2023 10:08:44 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.20731.1680084515050824205 for ; Wed, 29 Mar 2023 03:08:35 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=34523aef51=xiangyu.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32TA8Y62012350 for ; Wed, 29 Mar 2023 10:08:34 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3phqxbvjpr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 29 Mar 2023 10:08:33 +0000 Received: from m0250812.ppops.net (m0250812.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 32TA5iS3007171 for ; Wed, 29 Mar 2023 10:08:33 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2168.outbound.protection.outlook.com [104.47.56.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3phqxbvjpn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 29 Mar 2023 10:08:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mPhKgzDGHO/2ALIXsUnUHGHT2fHA63nqmn5uSOCVCDBITQwScG8z6X6QRLeoP4rDut6z15CbInpHiRA0DzHSLOnpg2hWKTNFBRYN2XnUFFIxaTEbiDNQfIbfyG4HDik8CTMSedFgskWo6FqXutTj6ZtyUlg0Ul4tuLhQZmlueFYE6hRsGYaKQ6XCdjDcG+3CAPoS16jeengs41jgmbq5CMjEapOiwc0mhk/UPqsCXsWrRQbVTOma2suY487bpFfCczb8DqrXEMuYU+2NushRxXAIzUDhpvxKQn+UnMyD6A9nzddxLnONPehy4qrKMgqRuKH21QBFjqhKH0LIKNzX5g== 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=eQv0RToIpfkCefRJkqIwwIZjycPj4gSqhN6QKQP0EHg=; b=ep8V9K0T4KTDdcAWAISuBR3h0KRed1UkjqP6qkfrypUrPuDf1pxY5fLojumbd53SGPC0SzewNNQXMx5wMpxOF9AUplzwiMcw/i02yi+WPpznQPCSCXG+sryM2ZE7QxEyN7PmUu7r4+zZjBEHoeHyVcbAm8NaEqU7SOxDL49TRfmuOUqYkqzpktttAKNGNz6nIJRUY1BoT3gIyWb+bUo90At4YFTvvVDSH3TOM/LVoFOOTyWcLpaHjuGOr9xokuCxNb24QUH6ttFbPH+fnJjNLj9EE/xX3XQmIuDDEY+kc1bf97dpOSBlB9nSl3G4b8ZkQH63F7ObhokRUGjRhrQTgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=eng.windriver.com; dkim=pass header.d=eng.windriver.com; arc=none Received: from MW4PR11MB5824.namprd11.prod.outlook.com (2603:10b6:303:187::19) by IA1PR11MB6100.namprd11.prod.outlook.com (2603:10b6:208:3d4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.33; Wed, 29 Mar 2023 10:08:30 +0000 Received: from MW4PR11MB5824.namprd11.prod.outlook.com ([fe80::2ece:f831:c97b:dd8e]) by MW4PR11MB5824.namprd11.prod.outlook.com ([fe80::2ece:f831:c97b:dd8e%6]) with mapi id 15.20.6222.028; Wed, 29 Mar 2023 10:08:30 +0000 From: Xiangyu Chen To: raj.khem@gmail.com, openembedded-devel@lists.openembedded.org Subject: [oe][meta-oe][PATCH v3 3/3] mosh: add support of protobuf 4.22.x Date: Wed, 29 Mar 2023 18:08:10 +0800 Message-Id: <20230329100810.705855-4-xiangyu.chen@eng.windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230329100810.705855-1-xiangyu.chen@eng.windriver.com> References: <20230329100810.705855-1-xiangyu.chen@eng.windriver.com> X-ClientProxiedBy: TYCP301CA0007.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::18) To MW4PR11MB5824.namprd11.prod.outlook.com (2603:10b6:303:187::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW4PR11MB5824:EE_|IA1PR11MB6100:EE_ X-MS-Office365-Filtering-Correlation-Id: 5dd8d0e4-b5aa-41e2-7022-08db303d8c19 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G2HZ5VrnilA5tzbxs6AnFFCfpda7s/BLhBMGsG+VrHxRXjLJXKgHc/XTnRH/QlU6KV6tJZLGvZshB0H3V2LAw92yL3spKDgRV7OPrFAV73JDcCsTxfLdNRz6SQCNFOiBfWt4oCQOcKwOblVSgfX0xEWcoUQe6LM6+S+4fZixZNTnYz1fNqZGJLwyUS4FBg4xvEqsEpVo7UIwOe6ldo7KvBogDoGLXgUoC3yi23OoZG0pkM/E/PJQdm6BvW4jgEdNZ7rGLadl/8f0lXTDF59aXQTPcEeg54huG+HXSVK0NgGMtqphcSRrCMFazqONbzY62szlzOSrxKvq1W3PzrSDWVgWHFFoAFCdt/H27Aj6dk11B9m88aCzCxeTGO5ue41YcX0aG4gaYF57R8obi/yaNGYljAs6ZKenS8QQlrN6prbhtRgP4unegoECjXxezVKOFtyIsvXjW8MiOa1/ZuzspUCJ2pdIPfLEuzETynR2LHiI9d6i1s685eLkvwuOAUsRT1Ei0J0vKwgVfxnliof2KcA5TMkxP3a996lzWxcJjQB+sqUi18KRp+uaz47jlYQ7iyGpgFpJmVVqkmFIt5LuZZDuhWLHLCtVzcHpv1jRKrg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR11MB5824.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(136003)(376002)(39850400004)(366004)(396003)(451199021)(83170400001)(2616005)(186003)(5660300002)(6506007)(1076003)(26005)(6512007)(8936002)(6666004)(6486002)(2906002)(83380400001)(41300700001)(52116002)(66946007)(38350700002)(316002)(44832011)(38100700002)(66556008)(66476007)(8676002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a0RpQlbmejWMme0fi8tYbs6qRwFjASxVg9UrWrkrYUc0hWvEKY6CYnb962n9LJgeELbbTPX6d8lfLqjspDI3tei+cxBdKX5bfIPkV/4kMwE53p7FjJcfE+FOASboJNuhonc9o9RRnWiqzRMOdEG4Yl9B8mahmiMvQ9Oh+AfvxexDqRazknpZYUWIULOSpMxUgIi6Qj5xIHVFHWL98HWw1w25306RrdXq7/BTctsjsa0YkIBs3p2ic65fZN50n9HmTTrYFrVkiZhWiVhCNOB/MkErze1Yf6zfMJodeXrfkGLa4DAQZ/Bugf37qqiHCNdAxBsUner/KyyBF3dCl0XUF+NLhoZqtVXDaZh5y1HJknbHAP5gu+aFxyPRPoOvyeQCNiVk4THxShUYynd3tjNDDH1KczFZDnri0eRSD27ZTIqsTIg5QSCDiwHaC7P5M2LibOUaOx7nN+hutfOs9rKhpLpwo+yQzz9rRygysdKcO4U4fyeVbUAYHwInBTKo3gQY2E6SwerrJxkGirlUVO7MMDhog2+9oHRxIjhP6s7fgHIXWGweXHQIS2okXws5MklY/e2bcNkTe/55rE4injlz/8EXMy7l1m9myA6divViOdyZ/+0YpNCp8GQlQiFHXQeYepjwpVVvMrSpgDeMswW00xJNfj/pqJVsESpm3F1ZrFK9vDs4Z+YxahSNuB5+LXUZYEhb0zyjgR6P39a6dNzIbRKPaWiGeo+H8e7XZ0rLccgVbKgbKsbwIc7lgNlh7aaSVVqvHMD6B1njwVWzpwn0wsLwRyM5oLjfo2B7kMn52zaFR6E1/TU5cHFmvVoJGoieIJyrIERHLCA0jUd4hVIyKGAv2wqkyAFgTIgghDAaiQqhqAjFWMqMTCZ3s4SeVrPGJzi6qcxbyNickr/PBieonxseK4f7Lyj68meuB7ZtnPtpj51txCIwjeKrYOJY/oI2Da+ppuX/cxWAqAdz1b4m+XZdYitjVBqtOl6OwZqbXH+34GOqs7/ZJ6pyJNNAQl3f16cNo7KACPk7CRRLYH1GwcO3vOMASM2ESigjps5CKLcm9TKuWiLqyEvpDkUtb48BCVtzf0PTce0hTu+Tw+nNseck+487HD0bGXFEY8P201fhjU+FEkWeXTiOc5iMD8cFOBaMNZWT1kYs1bClqW1IsZckuKp0y+OCjSmy+LpGchGFot2tpzFuVUztVkgHvNf+hqXd5Zfa4HsXGwZli5UwxoS4fKLSeil9R4OiDdT1m/6G/f41Z8998kSrkfWvU/5r5DygXEqrOWLBoYqDHnbCwycQJhvLr3VZ4A68Mr7fu9Pka4seXTxoLQpJwYqbpq3FymN2Y+D01kY9Zyt9zeikA/eWtafMj1+BY3klU7xHYGqRFUxZqtEJ/E6xWpZaWMGEECU5nqrAW30qBT79YxJHpiLc0rBORy3e08bUyJtQsDtCXeONrvO1OnQdbRTzwnmv5gknG8J5PX7/vTQn9T0ciJ9Z+OJqc2UzAWHzvjFKrFiC61mUAbqPxcKkOB6iHTyUwimZRY4F//oq8lEU1oNsaGeAIifX+B/54apZt24uLV8w9mTrvbzT0YeGk9jqNJ9RcnZuYxPzYCRmKp1kn8Dgrw== X-OriginatorOrg: eng.windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5dd8d0e4-b5aa-41e2-7022-08db303d8c19 X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5824.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2023 10:08:30.6451 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6yTuUqAzqquOLNbkvEZVgSOzc9n3kK+4BpWgFdR/daXAVzYY8RLQdP1AhNDiSXsvT/D09zPkjpPOE3gmhxk1e+Bpu7Zky0pjdTw2S5+6JS4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6100 X-Proofpoint-GUID: CtUB4-jzBOewaZHmXtNwTu0oHoT7nhml X-Proofpoint-ORIG-GUID: _BdKE-Q0y6pmtLGDwEfuSxmtRTwxwecP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-29_04,2023-03-28_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxlogscore=999 spamscore=0 clxscore=1015 adultscore=0 priorityscore=1501 lowpriorityscore=0 suspectscore=0 malwarescore=0 phishscore=0 mlxscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303290084 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 ; Wed, 29 Mar 2023 10:08:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101813 From: Xiangyu Chen Signed-off-by: Xiangyu Chen --- ...re.ac-add-support-of-protobuf-4.22.x.patch | 63 +++++++++++++++++++ .../recipes-connectivity/mosh/mosh_1.4.0.bb | 7 ++- 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch diff --git a/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch b/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch new file mode 100644 index 000000000..088124391 --- /dev/null +++ b/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch @@ -0,0 +1,63 @@ +From d9a1a6aac5a3b270449d09ec0d2a556807ab9287 Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen +Date: Wed, 29 Mar 2023 13:53:44 +0800 +Subject: [PATCH] configure.ac: add support of protobuf 4.22.x + +the protobuf 4.22x is using c++14 as default, this caused the mosh cannot compile anymore and report following error: + +.... +/usr/include/google/protobuf/port_def.inc:200:15: error: static assertion failed: Protobuf only supports C++14 and newer. +| 200 | static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and newer."); +| | ^~~~~~~~~~~~~~~~~~~~~~ +.... + +Upstream-Status: Pending [https://github.com/mobile-shell/mosh/pull/1266] + +Signed-off-by: Xiangyu Chen +--- + configure.ac | 8 ++++++++ + src/frontend/Makefile.am | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ee70c7b..5457009 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,6 +26,10 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AS_IF([pkg-config --atleast-version 3.6.0 protobuf], + [AX_CXX_COMPILE_STDCXX([11])]) + ++# If current protobuf 4.22+ update the requires to C++14. ++AS_IF([pkg-config --atleast-version 4.22.0 protobuf], ++ [AX_CXX_COMPILE_STDCXX([14])]) ++ + WARNING_CXXFLAGS="" + PICKY_CXXFLAGS="" + DISTCHECK_CXXFLAGS="" +@@ -311,6 +315,10 @@ AC_CHECK_FUNCS(m4_normalize([ + pledge + ])) + ++AS_IF([pkg-config --atleast-version 4.22.0 protobuf], ++ [PKG_CHECK_MODULES([ABSL_LOG_INTERNAL_CHECK_OP], [absl_log_internal_check_op],[], ++ [AC_MSG_ERROR([Missing abseil-cpp library.])])]) ++ + # Start by trying to find the needed tinfo parts by pkg-config + PKG_CHECK_MODULES([TINFO], [tinfo], + [AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if is present])], +diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am +index 1aa83fd..399ecd6 100644 +--- a/src/frontend/Makefile.am ++++ b/src/frontend/Makefile.am +@@ -1,7 +1,7 @@ + AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(CRYPTO_CFLAGS) + AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS) + AM_LDFLAGS = $(HARDEN_LDFLAGS) $(CODE_COVERAGE_LIBS) +-LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) ++LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) $(ABSL_LOG_INTERNAL_CHECK_OP_LIBS) + + mosh_server_LDADD = $(LDADD) + +-- +2.34.1 + diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb index 4537a0941..4eb0dba23 100644 --- a/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb +++ b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb @@ -12,9 +12,12 @@ HOMEPAGE = "http://mosh.mit.edu" LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter" +DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter abseil-cpp" + +SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz \ + file://0001-configure.ac-add-support-of-protobuf-4.22.x.patch \ + " -SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz" SRC_URI[sha256sum] = "872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd" inherit autotools pkgconfig