From patchwork Fri Mar 31 09:41:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiangyu Chen X-Patchwork-Id: 22000 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 588EEC76196 for ; Fri, 31 Mar 2023 09:42:07 +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.50662.1680255726686586395 for ; Fri, 31 Mar 2023 02:42:06 -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=345418c051=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 32V9dTMk022998 for ; Fri, 31 Mar 2023 09:42:06 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3php647qp1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 31 Mar 2023 09:42:05 +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 32V9g5CO028210 for ; Fri, 31 Mar 2023 09:42:05 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2175.outbound.protection.outlook.com [104.47.57.175]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3php647qnw-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Mar 2023 09:42:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dpql81gWepHBlJXMjzKQU8r1CtGGN1LIvJZlWwje6PAuUWZ0rq33bkoNOQKiX5OI9ffkA1vOzTLkTenegpNJoxT8TJgFEFq3w6u4Zz4ums3NhYbvvBdOZrHGLCS07IuJWzVkhCYPRNrk5Z1eHadp76TKk1AbMOKqSeYYCE4d/4OCmOs3lPfbm/JKz8RLWhp8Gtm5Y+kHsmuX7OLcib2H73Mu+Wo0tAuE4u2Ruk7KN4GP5qv64m3RREGJxsstAyhM8nDxUd39HBvkkFRq42kqNY+MB2fk+YMktt5/fkn+xMo8y4vuZ649aCbfEcqkL9Wb21k4IVVoyhxA7LUHHOB+nw== 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=IZUrgn9HbixK6GiTTJSvT4kYtDKvLhYuMGVv0yL2yJo=; b=Pxe3MjE5zx80d5ThQzPuul22coY7P1XMks4DDHhOL345fPVlJEC8Hb1oit8ILdwA3CIhIvXJTtpprvsHm66dPNpZwXUAdZeoeoF/a4xAQlO/+TobJq5aIL0MALGE5AYNZbBQfGj29yFxqI7mNO6SXeF6viNIp/soc3CD3Qw/m6KYoVDTP05LZd9mPDHck1c1yB0Jlp3UI+PqHgJLYWJ/rnXVXUUfB0ex1RCWZW3gHUh1hESxeO3STIBj52Zd5dMkDATNwwXJYqNX85qkdFgZWI5ULN+EHHpEj4OkmihtHSRJ7mIkbBS+/sxPvz83O8dLMHO4ZJpkQ343uEUxCQCqWw== 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 PH7PR11MB5820.namprd11.prod.outlook.com (2603:10b6:510:133::17) by CY5PR11MB6510.namprd11.prod.outlook.com (2603:10b6:930:42::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.23; Fri, 31 Mar 2023 09:42:03 +0000 Received: from PH7PR11MB5820.namprd11.prod.outlook.com ([fe80::e7a3:6c1:4c52:897a]) by PH7PR11MB5820.namprd11.prod.outlook.com ([fe80::e7a3:6c1:4c52:897a%6]) with mapi id 15.20.6254.021; Fri, 31 Mar 2023 09:42:03 +0000 From: Xiangyu Chen To: openembedded-devel@lists.openembedded.org, raj.khem@gmail.com Subject: [oe][meta-oe][PATCH v4 1/3] protobuf: upgrade 3.21.12 -> 4.22.2 Date: Fri, 31 Mar 2023 17:41:43 +0800 Message-Id: <20230331094145.2362159-2-xiangyu.chen@eng.windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230331094145.2362159-1-xiangyu.chen@eng.windriver.com> References: <20230331094145.2362159-1-xiangyu.chen@eng.windriver.com> X-ClientProxiedBy: SG2P153CA0044.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::13) To PH7PR11MB5820.namprd11.prod.outlook.com (2603:10b6:510:133::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR11MB5820:EE_|CY5PR11MB6510:EE_ X-MS-Office365-Filtering-Correlation-Id: 896c4f01-4e71-41d4-5e4f-08db31cc2f00 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MoRxoNe6Stz+q1efa5ps3w1VgudtyPxqSGgKbSkapDV6WK5OUwb3Xm7CYeeRR9/Fou2WNAkV8d1zKc6Zq1g7Mvfvldgws+zltYfVPt6ONco7aN67KEWyn87wnUaS5PXjcvnc0M2qsEvLmFsjOsUDgJ9BVrJFL447l4/1tTY2MTai8UEgZnmkh13aQK1bNz1QR32W2zXTtxR+KFjnuUzPqXcWEclP1D82sD2yYIcA4FpBbO+4gOp2eHIQLS9aFvGachBiM5/JSWco7iFNd3a8amDrKu59qiDwrP7Tr69ZXtbkKn9OBJLUcLUHMMC+l+6GleE4GjB6+LuwNNw19MuPOBISocVa4uZ71hdKPiAHGPVGRzGfiBNqBHEU80HtqZt8hDSr7CS3ABGOEFg/8lx5A66+R9GqhwI5TF6CyX+Fd9XrtP8/JoRB2DPzUIsjtL1iuZXYy7ilkJwo3X0nOqu9fbcnMePjhtPwgpvAh/ST0xZjucqWC/+ANVoDVjku2Ws+t2vIxmXzo0S9KKU8W2o4GyTio3ydsvzf2mrmKpfTvGpy5eziJmxuvprIlTMnoewxO8AU3QiHvIuNGfZriAfHW2bWKL8rW8YMbgs/WovYH1ebmRPm08KQxLIsNg16eBGZ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR11MB5820.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(376002)(366004)(39850400004)(346002)(396003)(451199021)(83380400001)(2616005)(26005)(6486002)(6512007)(6506007)(1076003)(52116002)(6666004)(478600001)(66476007)(316002)(186003)(83170400001)(66946007)(66556008)(8936002)(8676002)(5660300002)(41300700001)(38350700002)(38100700002)(44832011)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M0s8tBneBfbdT61FT2fPOBGZsGxnh7LuMEcDhoFxo+FSW8wXOG31SAP7B32/yJ6YSQwAYrgT68+jo6t96gSghdF1v869X+nbjlb+yiSU0tI2DSppIi5prA4FPT9iowFe6GOy1gEicN4OPUOi/LsskwgmSwL1TH6HbBgiWeSp5aPZ/VbusyJHuX50FafX4MoGqRtPPFxn4isJi+dW1k2ilvw/ngqnmEfTwlak4dkbJ/Qfrl5aiwMfMCMfV6oBo0ax/c0VxKV7LBFqGzxVfePawwirDbwU64X2eTwJRlewtfh+u4NZdHjkTB+5ayHs2+G9aZlcWyRCd6y419V8sJWNSV5/bQPUSlm9aoe3vXDh3IRT/bFw+pZso5Vhf9i8BHV7jsuSn4GW7BKnqTEImM8ZmR1G6TZo2ET5NT5oQF35dVkXr7ppQoYxRcJ0F959DmlZBcrY0b9/bzXWRph9P6s72qhjFne4GI9w8KcSp/eq5WqfJJTlO4dqF+Q4mkiQt3amuPP28YQ44opv1yJmG9FsfAbttjYrg4WzwJv1J5UXUD9bX2PnR7n+j4ZgifPzj6dTOAzaGt3BG77Zd/OLYf9A46vZ5r8BJDxXQPRIAbHNB4yYwzhSeifSwXH5NwJ5mOmFnjYrOUiCAJP+nOtl6r7ThBrTjntJMQ2+O+mpN+H67tQX7TyWzd/fZp2i4Qlh0WvBfqugOcwT/RR9UNhtIz8JL3j/W1vQ9pAR2e15TvHO4ulNdPVIQwkiC8HTWEhXYWWpM7Z+tBGNKD3UNdw7T291SkvII7J5Z9HScOKWISVxvDVAB8MFxkPHPdov69Ks+9EYeNZdDKb1pCwXJ7+iKzM2Wu3M97nd8m4m0nCagIgNREmPpi2FYVb5+Stm2IzKjXF5a/3BRiz8woFRS8zIHrFOnkqy6AP56m/8jegaUDdNmeb9TWqvpu//mc9CVtc/5gbOYuqDFI+vbQP8ECsL136iPb69dtQzNvkNDOXbJ/nMTeE+ZXIJmEFQZx2CuB2wtNS2jBRefczxhIrtLl4z4jwI1E+ys6NOWNXin5PpW46IwDyo+D2np8vxFGfJjToVfVhltlm4abqMHmJKxBeNpmm91ecSEJd8aebVgzROdsG2pbsbG0joU/vpdHlJ54YTq1vuNMPpYKlWGrtZC1VozatQu8FXmu1ab/N9mnXfeYvDEpV/bIFWHoh4uxvEvG37sidX5h1L8IxZZjqFSCsHb92sBLto969qUxY5VWgnVDmC+cgmRjzZGjZN7DG/VDv8skE+WILDCj/t3BAcXCUf6sBTaXjM+EsB2ejzXXniB9ZbMWxMyuz+EFStKlRLuWQTwoZkkzRi2V5Q8UaMog3eAeQETd3yrzAvxbQZ53wMsQI2oSoXi0n2xtgw08jsss9+0wYIji+swe1AoX40QJCAva/5ZLHTeSzVFVP3el0sM5grB/QBAgpmOaGRuPEas2KCYdfkBg0Rno3F9Q+F4aBWojdMttwnHkyO/fyHuo23lEhvMYdN4jCE9wEYoajd0wlW8mZ+SBykMq9gjjxiGGkJPF1hb4Vb5bhvFzwBxlZv+2U6mvU2cBUDWCXsq4HzYOeIBQWccKgSQ+QREGooB8PartUPUg== X-OriginatorOrg: eng.windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 896c4f01-4e71-41d4-5e4f-08db31cc2f00 X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5820.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 09:42:03.7692 (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: v1B37YuedsF0Un71IrdpFXXmHT9T+W4So2loSRKT/YHOhktuvWFobX5gnN4MpWrLbOoVL5bt3sdllzUIUDKk9NPi91iq2gtRFEFx4NIDTOg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6510 X-Proofpoint-ORIG-GUID: k_KT7NPlSQ_EmOoYAXVQsa8KUrZqXnBg X-Proofpoint-GUID: qxixGxh8RMNRRE2iJgnWE5R_HgY0CoCh 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-31_04,2023-03-30_04,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-2303310078 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, 31 Mar 2023 09:42:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101849 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..f99081b01 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{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/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 Fri Mar 31 09:41:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiangyu Chen X-Patchwork-Id: 22001 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 3DD92C77B62 for ; Fri, 31 Mar 2023 09:42:17 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.50607.1680255729292296573 for ; Fri, 31 Mar 2023 02:42:09 -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.166.238, mailfrom: prvs=345418c051=xiangyu.chen@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32V6vZbG007525 for ; Fri, 31 Mar 2023 02:42:08 -0700 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3phv85yhav-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 31 Mar 2023 02:42:08 -0700 Received: from m0250810.ppops.net (m0250810.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 32V9g1hF024819 for ; Fri, 31 Mar 2023 02:42:08 -0700 Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2174.outbound.protection.outlook.com [104.47.57.174]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3phv85yhar-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Mar 2023 02:42:07 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=drxA6xwqkTAZqEXj+W68ZoJgBBSzTQzrbIn1sfet/aVaw7Pn6PF3E+7TgJmsorPJgkD3l+uTNcZDpx/LkWmruuU6Oe2o9N0NWkFKDMF32l59gyFGIAcpRZvPYoMQ/1+1iEkWTnDkK3KN76CnwCFF7G8oP3v/ocBbAi8x7taVQfjjRREk/Jj5y3tjEd9OfLkv36dhTGR2KjQGI1ZGnWB4GZukDTj9FZl1Ylx3HoPbQPWBTDihlv9IL/6rrpu1Ff1INVRoOJpLzNgBSOR2LvW03nxZqggAI0irFf1gHxM794M4uoQJXS0SWqM0CZrCa4NyvyOuYXZcnRq4fJcYFwEEIg== 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=6Jyv8E51dn1atQVMa7eQcgafYynbiBVme/orhVJ3gXg=; b=k81ilh/hjG92yaF/zAMFCs5cW9JSaLTHOGn0m9PRwH9zMH43HGBt8VqRj5Qhi3A5FV2sERwUqh/ZBVkeE8DagcapOYZ7N3PiS1FY7IO5KrdVihhwPphZJQSKNq1IQVh+kBMnNpaPCC/lS3vycnFUMV8GBgszG/F5L4HVCME1E/N3gQ2ZH2X0lWLLrhQkbG57ONNZxe6zLwbe1Jp4K8DwXVkg1fhvfNSa25Vzf/9ZC/AtEn+NeKRx1/o3IoRXHRWxrrMhu073iDCs1DLTjtVZTMHYgJFtjntTyx7ZwSB3sI/VEFLNHSwjcFSzk/D7heXQVwbkx1H2nQZAg98irygqWQ== 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 PH7PR11MB5820.namprd11.prod.outlook.com (2603:10b6:510:133::17) by CY5PR11MB6510.namprd11.prod.outlook.com (2603:10b6:930:42::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.23; Fri, 31 Mar 2023 09:42:05 +0000 Received: from PH7PR11MB5820.namprd11.prod.outlook.com ([fe80::e7a3:6c1:4c52:897a]) by PH7PR11MB5820.namprd11.prod.outlook.com ([fe80::e7a3:6c1:4c52:897a%6]) with mapi id 15.20.6254.021; Fri, 31 Mar 2023 09:42:05 +0000 From: Xiangyu Chen To: openembedded-devel@lists.openembedded.org, raj.khem@gmail.com Subject: [oe][meta-oe][PATCH v4 2/3] protobuf-c: add support of protobuf 4.22.x Date: Fri, 31 Mar 2023 17:41:44 +0800 Message-Id: <20230331094145.2362159-3-xiangyu.chen@eng.windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230331094145.2362159-1-xiangyu.chen@eng.windriver.com> References: <20230331094145.2362159-1-xiangyu.chen@eng.windriver.com> X-ClientProxiedBy: SG2P153CA0044.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::13) To PH7PR11MB5820.namprd11.prod.outlook.com (2603:10b6:510:133::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR11MB5820:EE_|CY5PR11MB6510:EE_ X-MS-Office365-Filtering-Correlation-Id: aac543ca-1c03-494a-4129-08db31cc2ffd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IowMGqGg6kZ+ZD4yucud7X9ZipVQsE4JmI234LhG/HvL+csllMe01vHmkHhoSoQYlMIo7MYWbuVsbsjsEAB8AvA/FfMk1sdnu/NQ1/3iywRTb2sgh/ViDrVynG3GgmMS/yE/aZX8+SxF4gSRQutNm6BsWXugtabfzCtEjRoRIbQds+QG7t0j68EbxNoXpx0/OnTiqcvIYgLyrd43Alzze8iT1kX6sZivUue6kqJ9lKhBuGV2zekLrOUlPfgR1TSC+Lm8uJ63QoJ2Gdt7rZr2MEmyOw0LOkWrN+2FJjVnFKQeKDWaLmN3tgb71MMzwO8p3xFNHz8H/kXeaenkQVJpAlOQTX+rzRDUJnUDPZ/1sCBJ8TNqrlNMkVTIwd1sDJdTVLHRzFUWTqKPS65QygXwdQVw6GJW3NGAj7K2Bg6FzrnxKdjgDBlphsc5djwuTWXvAjF/dNG4pRihY5jc5gRAsesEm+n/zqDQF0h7V9SzoR6QsKQNvdHbKu3Gu4vZhKtTuOCvmQJN8LczpIbkTDmazECkuqVj8mSHSedMfQDpffT+IHtHSKSLGqc+8ZBKK66AkPjiPpDCwgjMwspUbXzaVpJfpt41oDYm4BDsBHzl1lQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR11MB5820.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(376002)(366004)(39850400004)(346002)(396003)(451199021)(83380400001)(2616005)(26005)(6486002)(6512007)(6506007)(1076003)(52116002)(6666004)(478600001)(66476007)(316002)(186003)(83170400001)(66946007)(66556008)(8936002)(8676002)(5660300002)(41300700001)(38350700002)(38100700002)(44832011)(30864003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KAI2jch6Lo6t+qcT4IbTGdFV1yuPUmJnaiVBkv+5hMyY2h9h35HW+00rRZ7j/CRrORsnY2pjL7gEjaCN28OgQYq69/4ap66D85vDn/qTxr+EMmnHiSZU8r/LYVBzSzVZ9ow+OgmRQXMT/dZEUx/SuPd14i4Cnqv9b+XKzi0uHqp3QVqmXZ47ck2hn8Sj6AfNgLDpmTrWP/n29fMlqazvEeiDZeDAt5ljlP8wGrsnrfpUxsI6SLWeF82G5PG1lX+8jUdSW+QyIgMAgvZoRuaJ+XObWHGTYNgDAmTGr3+7+vbSJn+xiJwnik8CYzsw2hMY1ByXpsD6k4O6Pcl9ylOjsP9IrbtUoUSnFaIjd907XNuC89NGbr41Hzf+N2DMLiIox8hZg0jfr76s5c/SS5bXXxdcNE5XW843Xs278I29SzG0yQEzntFLn1uNE/wrzUbhlkmMOx13rRQM5kdfaOOY9NKmf0HN2Yb+rSWd5klPS3equ3rrpwEd9m/ksNn5Y21gp/qo/UwNzJ1ePb/+anu+gKv33xlamD1L1S9zkQV1ptSrUajHRcLT2AeQ5RoGB7+CH+wXqD/KqMhrqvWuaZ404y3Zr1t3G6BgdQefhi8femlc+LS6GLJqv/VCfMAfQ4oS4mpI7SV86gV2kfgXH5ECVRxJngM1qQxsQefB1OW1fHIcmAhUuAdfnFZ51dr4bG+iJBteeb0PDO5qx+28oychZmfPQKMQ3msUIDaEVZplg4DIWarnkr98oKwOMNJfs15ub/MC+DbY60shnAE9Z9W5LHZkC9Fygxx2fzunzR3bvPjh7EGZf1UO9Wr9bXDnIK44lZaMCX0z2bTZVpD9Cc07MC6o7uuIJ3DeDyxRt3fC2YcTJzAiQZ2HniToOQke0YN2QFv+64YLk7zVpONPaxbvCYvm8szcMWwAainwotgsoLW7QAzepruDWqVvNwh8A8oq9odNrYssfKdFOR98XVXrYRmqMlQ6yj7XsaO1sNzYexiHpgI5nunv1Yv5an4WHuSizGZcNfsRdErGRt6+Ov7+qut0drunHQ0p9zHzV7zUf325GZREl/tJx8BBTkNLtc7TjFI7MWSC8zqFbhgSbH5QzUG4bt9SFO8D3xvcoXokilTTVeuMyCNeQhYVRYPwgEM1LyNY/JqO0fIKqb8IZgMEtjN5ywEd5dMr6MPU5UqkzTasUwAFeoKMNdD2ANpOx/DHoICnLt9BiDpmseuYMYqPup0glZo1335er9X4QeiIPVW9IjLIAF4VsyVEhH2IU/b3yFnMotCJLyZ2TiMNMIpPq7D88FYMBxRqpDReZg5ooqO5D/jthFsatS6FTvco9MPMafnCgF12vmb/5UG+LfRV6UmzTKgLh+ZLdQS5wV89xDHruGAVxzF33FaNXBItfDycTPglcPqj3vMWuN4FNIghGAn3AaZVYNS3KotR3XaTtut4h5zoniacIrER/dxNPSD+cVgE3Hynl1LH0brxABK9E2zlVLUATm0Z6RDSqCzqPz8yVITQU1pyS5JW3mnTW8yb4zCKrqeFy5ZcpETAjtSxj0ZVmlVmSn/5RScS88VdfuqV+swpuaOPyXFPCZdiOSbjDM4LbX14rD1T2ReFNgNOsw== X-OriginatorOrg: eng.windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: aac543ca-1c03-494a-4129-08db31cc2ffd X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5820.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 09:42:05.4988 (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: 1PSVrNy98+Q6ueWEb/+FKf7h55qroclCrCuJH1ZSCsWdR0bWm5bap9YdE/vNxKrwX/Nw1fXdwnawPcgVyV4jU8NrpH9q6YUPsARGHOlkhVA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6510 X-Proofpoint-GUID: uJBJ-3LNi3uFg9lVMSUHvnM7EwnUCLbk X-Proofpoint-ORIG-GUID: ZIKbnWct9CdiHheV4RSN6ArnrW3fcrEV 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-31_05,2023-03-30_04,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 adultscore=0 clxscore=1015 mlxlogscore=999 bulkscore=0 spamscore=0 impostorscore=0 phishscore=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303310081 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, 31 Mar 2023 09:42:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101850 From: Xiangyu Chen Signed-off-by: Xiangyu Chen --- ...ot-compile-the-code-which-was-genera.patch | 147 ++++++++ .../0001-add-support-of-protobuf-4.22.x.patch | 315 ++++++++++++++++++ .../protobuf/protobuf-c_1.4.1.bb | 6 +- 3 files changed, 467 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch 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-Makefile.am-do-not-compile-the-code-which-was-genera.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch new file mode 100644 index 000000000..4450a2f62 --- /dev/null +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch @@ -0,0 +1,147 @@ +From c263360d4f40beb2badd04e5bd084f46fd25595b Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen +Date: Fri, 31 Mar 2023 16:02:50 +0800 +Subject: [PATCH] Makefile.am: do not compile the code which was generated from + test-full.proto in protobuf-c-native + +Those code was auto generated by protoc command with test-full.proto, those code are not compatible +with protobuf 4.22.x, so temporarily disable compile those code until protobuf-c upstream adapt +the test-full.proto with latest version protobuf. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Xiangyu Chen +--- + Makefile.am | 116 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 58 insertions(+), 58 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 3b0d1d6..ff4c196 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -136,64 +136,64 @@ else + + LOG_COMPILER = $(VALGRIND) + +-check_PROGRAMS += \ +- t/generated-code/test-generated-code \ +- t/generated-code2/test-generated-code2 \ +- t/version/version +- +-TESTS += \ +- t/generated-code/test-generated-code \ +- t/generated-code2/test-generated-code2 \ +- t/version/version +- +-t_generated_code_test_generated_code_SOURCES = \ +- t/generated-code/test-generated-code.c \ +- t/test.pb-c.c +-t_generated_code_test_generated_code_LDADD = \ +- protobuf-c/libprotobuf-c.la +- +-t_generated_code2_test_generated_code2_SOURCES = \ +- t/generated-code2/test-generated-code2.c \ +- t/test-full.pb-c.c \ +- t/test-optimized.pb-c.c +-t_generated_code2_test_generated_code2_LDADD = \ +- protobuf-c/libprotobuf-c.la +- +-noinst_PROGRAMS += \ +- t/generated-code2/cxx-generate-packed-data +- +-t_generated_code2_cxx_generate_packed_data_SOURCES = \ +- t/generated-code2/cxx-generate-packed-data.cc \ +- t/test-full.pb.cc \ +- protobuf-c/protobuf-c.pb.cc +-$(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h +-t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \ +- $(AM_CXXFLAGS) \ +- $(protobuf_CFLAGS) +-t_generated_code2_cxx_generate_packed_data_LDADD = \ +- $(protobuf_LIBS) +- +-t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto +- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto +- +-t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto +- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto +- +-t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto +- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto +- +-t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto +- $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto +- +-t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) +- $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc +- +-BUILT_SOURCES += \ +- t/test.pb-c.c t/test.pb-c.h \ +- t/test-full.pb-c.c t/test-full.pb-c.h \ +- t/test-optimized.pb-c.c t/test-optimized.pb-c.h \ +- t/test-full.pb.cc t/test-full.pb.h \ +- t/generated-code2/test-full-cxx-output.inc ++# check_PROGRAMS += \ ++# t/generated-code/test-generated-code \ ++# t/generated-code2/test-generated-code2 \ ++# t/version/version ++ ++# TESTS += \ ++# t/generated-code/test-generated-code \ ++# t/generated-code2/test-generated-code2 \ ++# t/version/version ++ ++# t_generated_code_test_generated_code_SOURCES = \ ++# t/generated-code/test-generated-code.c \ ++# t/test.pb-c.c ++# t_generated_code_test_generated_code_LDADD = \ ++# protobuf-c/libprotobuf-c.la ++ ++# t_generated_code2_test_generated_code2_SOURCES = \ ++# t/generated-code2/test-generated-code2.c \ ++# t/test-full.pb-c.c \ ++# t/test-optimized.pb-c.c ++# t_generated_code2_test_generated_code2_LDADD = \ ++# protobuf-c/libprotobuf-c.la ++ ++# noinst_PROGRAMS += \ ++# t/generated-code2/cxx-generate-packed-data ++ ++# t_generated_code2_cxx_generate_packed_data_SOURCES = \ ++# t/generated-code2/cxx-generate-packed-data.cc \ ++# t/test-full.pb.cc \ ++# protobuf-c/protobuf-c.pb.cc ++# $(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h ++# t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \ ++# $(AM_CXXFLAGS) \ ++# $(protobuf_CFLAGS) ++# t_generated_code2_cxx_generate_packed_data_LDADD = \ ++# $(protobuf_LIBS) ++ ++# t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto ++# $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto ++ ++# t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto ++# $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto ++ ++# t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto ++# $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto ++ ++# t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto ++# $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto ++ ++# t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) ++# $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc ++ ++# BUILT_SOURCES += \ ++# t/test.pb-c.c t/test.pb-c.h \ ++# t/test-full.pb-c.c t/test-full.pb-c.h \ ++# t/test-optimized.pb-c.c t/test-optimized.pb-c.h \ ++# t/test-full.pb.cc t/test-full.pb.h \ ++# t/generated-code2/test-full-cxx-output.inc + + if BUILD_PROTO3 + +-- +2.34.1 + 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..86d83e9cc 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,11 @@ 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 \ + " +SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch" + SRCREV = "abc67a11c6db271bedbb9f58be85d6f4e2ea8389" S = "${WORKDIR}/git" From patchwork Fri Mar 31 09:41:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiangyu Chen X-Patchwork-Id: 22002 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 3E3FAC6FD18 for ; Fri, 31 Mar 2023 09:42:27 +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.50609.1680255741610540351 for ; Fri, 31 Mar 2023 02:42:21 -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=345418c051=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 32V8IgjC018153 for ; Fri, 31 Mar 2023 09:42:20 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3phqxbymqn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 31 Mar 2023 09:42:20 +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 32V9WqWl007717 for ; Fri, 31 Mar 2023 09:42:20 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2173.outbound.protection.outlook.com [104.47.57.173]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3phqxbymqg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Mar 2023 09:42:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hFzgarTGd9IqyfNJDGVDdJE6eR5elN/2xGdue1HlollLlg5MCUVkhdDZECzJ9eu+Qumb2t3GF4UqPiMA6h6J0r6kgsI9oDWOEsUXctIL2iSZKkRrz4/Rz6QAH2O9d2mox0ReXVjv0OMVmXvJW6EHx6dtqhZYvYVQ91L22adoTlSAjcwyOcq2JElV8N/IdtaNYy2V764QJLOHvDqUX8IcMYCSpqzg9OLvLY2z/mZkVtGCRLfh3BhDzAjdobdgEWH/58d6aUDa5JaP3vXpINCtqipnX7DJTsYifAHa5BRtZHdrSBJ4x4guQzhbfNLEnYkHFUmzo+srhJQ2XFwg3RtY4A== 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=V532zccMFBS5yn58kkYEaG1rqxccxewxAIBdkKrzLVC3pwBZxfC0ChuoKT8FO+W1i0OPD/RSvcBpW58PWwpW2QAWjtG9QPH5uWutxyyHP9w/6ti6fjDALpRt/n5wSXLvQI8PdQu9IdG3AtjxJLkTgYqwDYHzyJLsJ0Bsw0cjMZX99dr+vWH2MkyAVmnTZYufq99aAgPVTA0G8vM2TSCiy4rEECJLrjJsGaokK3NQ1EJ640Qolmhj96e/E59WTcVHSTUyGP8ZuYm6I/NDfcOXvTMmTbN810FqZ/1w4Mv05eB/Wp+dAG2R/FrVP32TmzTev/R1Ie/C5pdFxcZB8dLSVw== 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 PH7PR11MB5820.namprd11.prod.outlook.com (2603:10b6:510:133::17) by CY5PR11MB6510.namprd11.prod.outlook.com (2603:10b6:930:42::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.23; Fri, 31 Mar 2023 09:42:07 +0000 Received: from PH7PR11MB5820.namprd11.prod.outlook.com ([fe80::e7a3:6c1:4c52:897a]) by PH7PR11MB5820.namprd11.prod.outlook.com ([fe80::e7a3:6c1:4c52:897a%6]) with mapi id 15.20.6254.021; Fri, 31 Mar 2023 09:42:07 +0000 From: Xiangyu Chen To: openembedded-devel@lists.openembedded.org, raj.khem@gmail.com Subject: [oe][meta-oe][PATCH v4 3/3] mosh: add support of protobuf 4.22.x Date: Fri, 31 Mar 2023 17:41:45 +0800 Message-Id: <20230331094145.2362159-4-xiangyu.chen@eng.windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230331094145.2362159-1-xiangyu.chen@eng.windriver.com> References: <20230331094145.2362159-1-xiangyu.chen@eng.windriver.com> X-ClientProxiedBy: SG2P153CA0044.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::13) To PH7PR11MB5820.namprd11.prod.outlook.com (2603:10b6:510:133::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR11MB5820:EE_|CY5PR11MB6510:EE_ X-MS-Office365-Filtering-Correlation-Id: d9c9b94c-21fb-4cdc-cef9-08db31cc3129 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EQwcwjO+KtE1srJl9/f4jewMuSO6L2dM8Bp5oz7jnW/Xl2RCldK0B617zaCV/TPPYoWKO367XGb1r38Wk8fp245Em1zVURGOYZh6MAaUWxuZzBfMLmdhPVY4LNcNH61jeaDzc6XkPw7vG0u436/6Xc/HZxF3N+vnVI039JkLuLHJ/RC4bFHyFkUnNUC5aURFG/ggb8W1o9LlTmiLVn0yniB/4OTfUrvRF5lcdyFayVUapReu5cm6A+x8odCPRKRuMcaxKLTdeOkizm1qgX81E1xFElgS/mze0u8U0maZad3iLe6w6dMqYontdxX2LbEb8EquUdR4X4E2ZVbg0Rnd02Jlt2+Q0b7TQ9iFp1szSgJ6DMYaZwm6H4H0kLDNLwYDy11SgTJyIh2awS+rp0htjwaujcy+Xdw8keiJ5As+/5l71rFVCZleuu9xqiLYR/iF8/vmTlc0mYgGzMg59Mp6wu5aOPOpK9mLyXZN0ogEdo6C+aIyEJrSL3WBvmXipSbjeUzgcdXoyhooHhPvgmOk5K7b6N1EKYIXMrWOiBlaPao8zcZfMvduDX0G5Q2i8izRJZewN26XZ/8X3GuJRSNjGT/1/2rTWuSlJckGRWuizAM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR11MB5820.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(376002)(366004)(39850400004)(346002)(396003)(451199021)(83380400001)(2616005)(26005)(6486002)(6512007)(6506007)(1076003)(52116002)(6666004)(478600001)(66476007)(316002)(186003)(83170400001)(66946007)(66556008)(8936002)(8676002)(5660300002)(41300700001)(38350700002)(38100700002)(44832011)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GCdPheSJHtf/jXtABkO14K+9U+HgsChv5Y5MS9s0dq1hsEfv4mJRA1Gs+d0lJgqC0Q4g9ZHQpUCPeGMCnTeh5YleJky/Y/novN9MFdWCF3ZbMHOWC6F/2R9HWoJ4afcyjls57ycFmeIYSzFyR1R1to8kRVkd2gFwxshE9gN2LdxM36eSX6WvnF70v+jEP5IHVPtv2jRco7D0QebMYxvQlNkyeCqGEj1bCaKEipOhXWLPRr64OFMQ9jh8s+RMhif/ZNYBqUFMxZfgBpzs5RrYs4Zep+fxpDEJjlvLdTENqxppdhEpd7sGK/10H6EylrYLwr4WQYSUeYR2XfTX7QE4n4XzonALvJp5BME+mIe/A114CMbxmdkZS5rsxeFvGtbdKywM4ImqJoXn/4TXYgQ1IJ86GmGjnOm41BgAEzlyUzUyv8rg3QJPAxxmEmki8DNToaA4JKI3l4jxsHaJbyTMOtIXS8FUfS0z0GpT7ORjSgt1qStDuE4AI3rys73i+dljJlX2MW6pAfM36OVA6fjmTgedMDe0SOKfHuYUaDLHttdAe80VTNPzHb8sDOoOUuQtrPbTMEPNqnzrBYN9BGBvRGSE1HUsCKNwRxUq/YPDHQqfWCGIZk6wjq3bhRN87I/dTnPW8lSGgqcMKTR/51fi1fBCYfhMTmcQ8VL/Z1o0cQ+Vx/j31QoCZyImhXlVf7ZwWOuoztXh+GWK8En3wOau+3emUitnAa54cS7/T6a8t7Zn/tl+uSJ51i23JV+L+HnK0SJrKJEDMoyV4fHmxTv34tl3Nmf8LqeYuLFXXRQryr8e3pQfm4m9jvHZjh2doqZofUYHX6Ha0QVjbp3qT7iEeTokN4cLVfLDm6oBdzdYu3WzUl7/2hI0um3QsdkJ2A9u+e+5o/t1NbaoNDFN/phfIrIhV1DZzE8ByGStLiECQFBGDZmjiU4pjUxzTXOG1X/PICfNrDCl9SRfW6TZCcy6LqZgO1qXMe7AOeOdrZlSqOWa73zKogOEMl29h/4iFUMcp2ntfDlruz7QlJPwRyvdlDH6+HxobXwC0M2Z1PTQ7WXXoXMTiQqpA1Y7V04eDFe7wBIPwr8WNy3unIFFVENXXN/qaaRfTtR43yac60lQdIv/AaiGyVGhohM6YCfF7uCbnLcNP1G2E3CU1TUwsVMMEYazCZiC4kX9R7yvPiP7K/Eb7gtEXEE1mbFnTZ+J5UW/uqRxSbXYNY+rqAML5/Peq29nLGZXjBJAvyMowXFFHkT2aRFqbN84Xt89oZdI17wLmc6WFTsoQvpAyJPLljqMN5CtDfOQp9082Tiy1kwYaPaqCSOKqytSA0zzX0M6GhGgGn9iMaW8qyZOBcn/X5W6Sp97kKtScoIXsVS5WVypDLXNnyL8teVWPNYrkDiguOVTYhpx5/In03Vp7Dk7VcaEvEQxKRbMNWMpyNelpWi9wMs1L7WTSITPRoiBLvVyYHW8TIAkIQByVjLRCI06Q9ntwyQRRYGnKdLMeTp1fuPjTVlThJbSuz8DnzvapuS61N4ZGiwHJ1bEXJOSb6iFcJenMA6qN/FKOdR2oBylx5CylaBWaxygPNm0412Odh0TZt7t0PctOE/wmArMMIfiVPSDlA== X-OriginatorOrg: eng.windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9c9b94c-21fb-4cdc-cef9-08db31cc3129 X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5820.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 09:42:07.3609 (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: dKZoRzz9G+XiMwuFRgmYY89UdJ8RD6oizVFrjERn6fn4G5TIR06Q8HHE2MW+59OYnf8A6xCVsCi2TqPC8fDOfFW8wuUvuscFU45sfTbGbr4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6510 X-Proofpoint-GUID: rkhkuVXYjg0Nbik5kh74aA2kDaM8XIqA X-Proofpoint-ORIG-GUID: tFeHOKrBESm0VtOv-XYl47QX3qYvkMhJ 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-31_05,2023-03-30_04,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-2303310081 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, 31 Mar 2023 09:42:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101851 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