From patchwork Wed Sep 27 08:42:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 31235 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 3F38CE810AC for ; Wed, 27 Sep 2023 08:42:58 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web11.13266.1695804168090541637 for ; Wed, 27 Sep 2023 01:42:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=idbRAoMw; spf=pass (domain: gmail.com, ip: 209.85.128.48, mailfrom: peron.clem@gmail.com) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-405361bba99so102119715e9.2 for ; Wed, 27 Sep 2023 01:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695804166; x=1696408966; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y3IRUxAP6TZRsMoByLp791YA7R9j0Atv2jRoActYUnY=; b=idbRAoMwqTzR2d8OdeWlbitPK2oblv/Bmvemtt9saowuasPE1oiXNMXfAImO9y/M2x WNDnIn1ogYixGPxJzBP31RdEElGV8VSOCSJueUKcMOBxWL7IUIdTlqXl6z8/yaLyEUk8 F7rvg3FkmrXOUZU8kZmAPkCPUmaFVsZoz/LmnuKjC9+lTIHyAM0lDC+wY4AGXgew/xhJ MOocBjTsYI6RJO4ye08v5H+v0qn22Ibc/W8JNo+t7wKZ5mpVNDyCodQfPUQA49rXjFBe gB9IL0btr819Lu1xeye5vTsSwN/Nn3wQHsg6wQtufXsd0hdkElRN9nc9QChFPpqYo+f5 MEAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695804166; x=1696408966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y3IRUxAP6TZRsMoByLp791YA7R9j0Atv2jRoActYUnY=; b=B9l7kXxPG8DlMlewKFq9ujR4DdzG4n5wR1l1HHVrdLVDUshEGclBaEzhoD+czd3GFI GLBjt/bOZ2aMqflomEpR0pPfH6Ocyi5gHQhu2Ibx9vPWPRw3zjItfoDfHbbYql9jHWI7 Vd7nSVAgXlDbjZ1Gz6PSp/Y7AZ5K8+GBOShd0mQ5tWAtdUNyd7oWIdUKJWOzbgRb5eLW e2vDyvdELTWSzQTfimDfnj46yxVmW+HUN62xz44v1HafU3nXowzD2/65bePktT5eCFbM ItjJj9UaEqObFNMIBlizYaCycvi97GRxMLH7Q5MtAGxlGa0A9ZdeYLGjRind+yEYSZHh hN1g== X-Gm-Message-State: AOJu0Ywh+DUtCPqs2SO9H9U2ToMjObPpjBwBbLANDb8IVDLlUpyUBBPk sSMx7WzTW3xi9/e2pW25T6jr80MBLfo= X-Google-Smtp-Source: AGHT+IHCfn6p+08ufyeErt7dF3J8NbuWH4om3hGeNEKzdnjVo9gfHEE/lTRvQ6Pi9653SfRlk9WCIQ== X-Received: by 2002:a05:600c:218b:b0:3fe:5053:1a0b with SMTP id e11-20020a05600c218b00b003fe50531a0bmr1326068wme.11.1695804165357; Wed, 27 Sep 2023 01:42:45 -0700 (PDT) Received: from firmware-builder.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id c24-20020a7bc858000000b004030c778396sm20008616wml.4.2023.09.27.01.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 01:42:44 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: openembedded-devel@lists.openembedded.org Cc: Xiangyu Chen , =?utf-8?b?Q2zDqW1lbnQgUMOp?= =?utf-8?b?cm9u?= Subject: [PATCH v3 1/9] protobuf: upgrade 3.21.12 -> 4.22.2 Date: Wed, 27 Sep 2023 10:42:34 +0200 Message-Id: <20230927084242.1195772-2-peron.clem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927084242.1195772-1-peron.clem@gmail.com> References: <20230927084242.1195772-1-peron.clem@gmail.com> MIME-Version: 1.0 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, 27 Sep 2023 08:42:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105176 From: Xiangyu Chen Signed-off-by: Xiangyu Chen Signed-off-by: Clément Péron --- ...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 d95e1c20f..b97da6ea6 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 Wed Sep 27 08:42:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 31231 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 418F0E810A8 for ; Wed, 27 Sep 2023 08:42:58 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web11.13268.1695804169075677633 for ; Wed, 27 Sep 2023 01:42:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=al02nNgr; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: peron.clem@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4064876e8b8so1181355e9.0 for ; Wed, 27 Sep 2023 01:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695804166; x=1696408966; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Mv9onMfzryYeVT3tPm0WaM1IyMYOr9Imu+/BBYjJWwA=; b=al02nNgrboefYlxdzmY1afAHcgjOUQWXWCh8n9ywvYLAdrORCpTZfls7WunDsJyxhs kIWe3FnihR57uLe3xNGiGbPYhYdy58N19dn6FrZe0dof8NMGY0dx5KWI+UST3oN1qtYT vUSCY9nHEUbHi0FASiM34FCMWfYwSj0A8TM+ci0uXcvOryyOkfbhUJcs1q1fV9f+MGhb A327mp65KYr1Pm5ocp7zbBsSzciLACxvRvy+kQrC4RpgvrxY7Ww5+PRAIJ+Saq/MOvF/ 4rYKUd7IZBFDgnl+pJBAxyCT1dVfUDj6m9WHKOBVB9CfdF11PtU6nXn0Mm9evk7cLRPA Gs8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695804166; x=1696408966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mv9onMfzryYeVT3tPm0WaM1IyMYOr9Imu+/BBYjJWwA=; b=PV89xknbbjXekFdjNffuBeMZ42oGPhGnzwiJMaXtG21Zti3MCwJspMJXbg1/ubJDAn w5Sa7ZFkZdr5Qr8j/HcCkvAzwGSFjgCsrC8O5rp7v/E4az1SB8WuBLIqcCYZy4KgQKZx A/NZeFjHuOItf/0IqudVdmhRQCpcV4rfTkA8FeDvOklo62lVOzsFX6GluHi0IB4tc2ew xfvSZd90eLoOPMDkAWh6/imdcRhhKELZAV9/kLuZv4UDcbu6WWBA65T/XAEsreAWOSao z/D48mMpQfbK3lN1C2sIgiuDjdtL/g7NgM+wM+RqtVyNMxviMLoOwxiA5PGoYYjpF4+Z XOsA== X-Gm-Message-State: AOJu0YxjtfKvkSLCz+3qf+40CouI/uAR0qqCbuG7KkKt9kU3qqsM7wXn Juy1kNlFpKPu93wUHvLZu3iKU1jkgZ0= X-Google-Smtp-Source: AGHT+IEcXSw0u43yHY+nwT1o/4MxGdN1iUq4OTW1zlxWT1meh59HmFWmYmRhNdIC6By8X0gIj+AJeg== X-Received: by 2002:a05:600c:2184:b0:403:b64:ad0a with SMTP id e4-20020a05600c218400b004030b64ad0amr1228459wme.26.1695804166340; Wed, 27 Sep 2023 01:42:46 -0700 (PDT) Received: from firmware-builder.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id c24-20020a7bc858000000b004030c778396sm20008616wml.4.2023.09.27.01.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 01:42:45 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: openembedded-devel@lists.openembedded.org Cc: Xiangyu Chen , =?utf-8?b?Q2zDqW1lbnQgUMOp?= =?utf-8?b?cm9u?= Subject: [PATCH v3 2/9] protobuf-c: add support of protobuf 4.22.x Date: Wed, 27 Sep 2023 10:42:35 +0200 Message-Id: <20230927084242.1195772-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927084242.1195772-1-peron.clem@gmail.com> References: <20230927084242.1195772-1-peron.clem@gmail.com> MIME-Version: 1.0 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, 27 Sep 2023 08:42:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105177 From: Xiangyu Chen Signed-off-by: Xiangyu Chen Signed-off-by: Clément Péron --- ...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 Wed Sep 27 08:42:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 31228 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 4074DE810AD for ; Wed, 27 Sep 2023 08:42:58 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web10.13084.1695804170650126697 for ; Wed, 27 Sep 2023 01:42:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kdIgbs+/; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: peron.clem@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-405361bb949so113311225e9.1 for ; Wed, 27 Sep 2023 01:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695804168; x=1696408968; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9aMcFJTLSQ3KgIt5h1CsiNkpJNO98d6lat8zqh3iNQU=; b=kdIgbs+/gLxXOyGCFm20dLcwJjfOWaPjQ4lKZPYrnf2lOXKzQLYCIsbCb5ZGY6m2n3 c7bjBXn3IqL5i2iJJN4cwWUma2WxYWQXYdRp7Z58p4bSCzVHPXVXu9OD5qWVHXpFguuG bR4+T45fhsBsIgs0Hc3vDOEDMQOaXu1yQ3R4ipivte6WmOKwQ8DHalW5tfpkS/QRtUex sIkKcGScYi5u3WTDEPqcxIWz/SHL4O8CW85UkK4YBX1Svm6PFVT8tgmGTnX1HzFvfvFu DJQujt10oFet1C3K570gJpB79WAOL9tSVbqbmmV0q7L6xwlS06usEDz4gN+iAKHJAJjY oHWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695804168; x=1696408968; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9aMcFJTLSQ3KgIt5h1CsiNkpJNO98d6lat8zqh3iNQU=; b=HyHD02wM1DLG1EMmR6/JuL9hMiiMsudVfL+N9FeBxPxpPgN7gNxxf2uUjUT8oduIqa H2BRQJ+qM55GciP7/Cu1tppbedmkMLTqKiYroeZudvhkUYyeU57aoV6nIJBSrnt430gb ygyGJMWvVhCboZhO9OKymFpOk5Nxhc1kbxUJMHnGLpZTjMu1jq0HUTbE+mdS1oJJnC9j goHbO72F2h5QxJEVCZL8KSh8/QPbpUVBVXN0beBfci16Eh3PSkUMFsek5aK81zLzR3Ba VM4ZyJDxqHZfd7qnHNhHeg+99QTJoklgJFol+HQ8ZLFPpDYfmP1lUMYk9sCifI34PQpR 9bGA== X-Gm-Message-State: AOJu0YznsrZx2LKEBH57Nv2m8HrgrlMDGyMOaNrxe2fiAcUgEQXjbOFF RzQvkDbWwdVxSEhRyzkHotyfnR5ThUA= X-Google-Smtp-Source: AGHT+IGk9zA8HPrV90sWvkRHn9rQOdMI9GsiFmmyhn36CQnvWsd5mEUI3OQ2qfMfnzM1/lAXxWbzfw== X-Received: by 2002:a7b:cb86:0:b0:402:8c7e:ba5 with SMTP id m6-20020a7bcb86000000b004028c7e0ba5mr1201679wmi.18.1695804168127; Wed, 27 Sep 2023 01:42:48 -0700 (PDT) Received: from firmware-builder.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id c24-20020a7bc858000000b004030c778396sm20008616wml.4.2023.09.27.01.42.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 01:42:46 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: openembedded-devel@lists.openembedded.org Cc: Xiangyu Chen , =?utf-8?b?Q2zDqW1lbnQgUMOp?= =?utf-8?b?cm9u?= Subject: [PATCH v3 3/9] mosh: add support of protobuf 4.22.x Date: Wed, 27 Sep 2023 10:42:36 +0200 Message-Id: <20230927084242.1195772-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927084242.1195772-1-peron.clem@gmail.com> References: <20230927084242.1195772-1-peron.clem@gmail.com> MIME-Version: 1.0 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, 27 Sep 2023 08:42:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105178 From: Xiangyu Chen Signed-off-by: Xiangyu Chen Signed-off-by: Clément Péron --- ...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 2869e0633..0ee050da9 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 = "https://mosh.org/${BP}.tar.gz \ + file://0001-configure.ac-add-support-of-protobuf-4.22.x.patch \ + " -SRC_URI = "https://mosh.org/${BP}.tar.gz" SRC_URI[sha256sum] = "872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd" inherit autotools pkgconfig From patchwork Wed Sep 27 08:42:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 31232 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 53961E810B2 for ; Wed, 27 Sep 2023 08:42:58 +0000 (UTC) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by mx.groups.io with SMTP id smtpd.web11.13271.1695804172087419817 for ; Wed, 27 Sep 2023 01:42:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LPIvILQa; spf=pass (domain: gmail.com, ip: 209.85.167.41, mailfrom: peron.clem@gmail.com) Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-50444e756deso13144286e87.0 for ; Wed, 27 Sep 2023 01:42:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695804169; x=1696408969; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/Paz36ekLcpCZCJW0j7qgHyStRY/rvanK8tOH6fnzNk=; b=LPIvILQaSX4fTWYam9bxQOvI7Rl2Wmf0V3x3Pv4uiIzzEg4V8JR49afJc1hl1JXuMf ZZpFHgKaOmOsWh3pbuoA3k9di/fY8OwFejbuDRLTiJNFxTzbUhVfpnNiNQhcrv6iiJv9 JIV+XbpmVTbqruZXfGRJuiqSLVAqPrRIsNo/wQE+bnv8AtviGvn1VFIxgEAVhe+s2mtj Z+lurWQV38SK4op4SXUsu8JAob/oL7n8r+vcDGxVLtvWJiHWWKYmWh2vIZkOP6Twxhdt VEg0GNEn2+isXq2kimoHzaQyfmaclRkfaHIUFW3gYnNbN5ncgOHfz+JkBOqUho3vSKew I53Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695804169; x=1696408969; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/Paz36ekLcpCZCJW0j7qgHyStRY/rvanK8tOH6fnzNk=; b=l/EER+Mfw8K1i/yPCY7TOuNmMoi67T693zqK6RFei//Wsuk8ydfMWoxhJFQ30KKLVD Jco4yXwMVU/0NRsyleDjexesceN67BaOf2StSHS449yiY+wF5hhClPQbYcG+52R/0VLH V0O09QDk1l93N7Q/E1DTpmpLB6TS392vMh39i17G+4At8K/JOXjCs1RooK43R/ADTPJn kLwRCq8diDnTfUviOvHUyjzgxT3fqtptUUSNsZRsrKf3F3OR5JadyZgU5JzaKtNEJgsm bSd68FMRtnnxmLe1VVxzhw2xxwOkwuef2+w4OpQPAavoPsCjD8l97y6XEsLdDN2fyH6a 62lw== X-Gm-Message-State: AOJu0YyvYJYiZKtWIRdGoxjtH4FYbW5+mOzfIcNFmLWll5fQNHKt2PEH haRmvM/pMnPWH88KP6RCokHfqAh5bQk= X-Google-Smtp-Source: AGHT+IE3jlYjzrlx4bbbbGtonBIbxzPoSBspsbHeAwQRHzjA01UYnp0N7eVhj9LuLfWQTPUqZv0MOw== X-Received: by 2002:a19:4f07:0:b0:503:38ef:eb54 with SMTP id d7-20020a194f07000000b0050338efeb54mr1015037lfb.37.1695804168919; Wed, 27 Sep 2023 01:42:48 -0700 (PDT) Received: from firmware-builder.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id c24-20020a7bc858000000b004030c778396sm20008616wml.4.2023.09.27.01.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 01:42:48 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Subject: [PATCH v3 4/9] devtools: grpc: bump to 1.56.2 Date: Wed, 27 Sep 2023 10:42:37 +0200 Message-Id: <20230927084242.1195772-5-peron.clem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927084242.1195772-1-peron.clem@gmail.com> References: <20230927084242.1195772-1-peron.clem@gmail.com> MIME-Version: 1.0 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, 27 Sep 2023 08:42:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105179 Remove merged patch that export plugin to a separate targets Remove no more applicatable patch Remove CVE patch already present Signed-off-by: Clément Péron --- ...RPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch | 62 ------------- ...d-separate-export-for-plugin-targets.patch | 93 ------------------- .../grpc/grpc/0001-fix-CVE-2023-32732.patch | 81 ---------------- .../grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb} | 7 +- 4 files changed, 2 insertions(+), 241 deletions(-) delete mode 100644 meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch delete mode 100644 meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch delete mode 100644 meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch rename meta-oe/recipes-devtools/grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb} (90%) diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch deleted file mode 100644 index b245ad865..000000000 --- a/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch +++ /dev/null @@ -1,62 +0,0 @@ -From dc593958e556dd496b774f35c5992285510d6859 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 19 Oct 2021 17:09:55 +0200 -Subject: [PATCH] Revert "Changed GRPCPP_ABSEIL_SYNC to GPR_ABSEIL_SYNC - (#25681)" - -This reverts commit 931f91b745cd5b2864a0d1787815871d0bd844ae. - -Fixes sysdig from meta-oe and other recipes (like com.webos.service.tts -libgoogleassistant from meta-webosose) failing with: - -| FAILED: userspace/sysdig/sysdig -| : && /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-sec -urity --sysroot=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -f -debug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/bu -ild/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/OE/build -/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -Wall -ggdb -std=c++0x -O3 -fno-strict-aliasing -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security ---sysroot=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-p -refix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe- -core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/OE/build/oe-cor -e/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-cor -e/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2- -64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/ -oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/ -core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -Wl,-z,relro,-z,now -rdynamic userspace/sysdig/CMakeFiles/sysdig.dir/fields_info.cpp.o userspace/sysdig/CMakeFiles/sysdig.dir/sysdig.cpp.o -o userspace/sysdig/sysdig userspace/libsinsp/libsinsp.a userspace/libscap/libscap.a - -lelf -lz -lcurl -ljsoncpp -ltbb -lcares -lgrpc++_unsecure -lgrpc_unsecure -lprotobuf -lcares -lgrpc++_unsecure -lgrpc_unsecure -lprotobuf -ljq -lb64 -lrt -lanl -lssl -lcrypto -lluajit-5.1 -ldl -lpthread && : -| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' -| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' -| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' -| /usr/include/grpcpp/impl/codegen/completion_queue.h:259: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' -| collect2: error: ld returned 1 exit status - -Signed-off-by: Martin Jansa - ---- -Upstream-Status: Pending - - include/grpcpp/impl/codegen/sync.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/grpcpp/impl/codegen/sync.h b/include/grpcpp/impl/codegen/sync.h -index 4cb8133c7c..3d10d9a3a0 100644 ---- a/include/grpcpp/impl/codegen/sync.h -+++ b/include/grpcpp/impl/codegen/sync.h -@@ -47,7 +47,7 @@ - namespace grpc { - namespace internal { - --#ifdef GPR_ABSEIL_SYNC -+#ifdef GRPCPP_ABSEIL_SYNC - - using Mutex = absl::Mutex; - using MutexLock = absl::MutexLock; -@@ -142,7 +142,7 @@ class CondVar { - gpr_cv cv_; - }; - --#endif // GPR_ABSEIL_SYNC -+#endif // GRPCPP_ABSEIL_SYNC - - template - GRPC_DEPRECATED("incompatible with thread safety analysis") diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch deleted file mode 100644 index 679bd3882..000000000 --- a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 3150cb043363e05588062dd392b940be25594713 Mon Sep 17 00:00:00 2001 -From: Stefan Herbrechtsmeier -Date: Tue, 18 Feb 2020 14:17:07 +0100 -Subject: [PATCH] cmake: add separate export for plugin targets - -Upstream-Status: Submitted [https://github.com/grpc/grpc/pull/29328] - - ---- - CMakeLists.txt | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index efdaf8936d..6608b1b00c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10935,7 +10935,7 @@ target_link_libraries(grpc_cpp_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -10975,7 +10975,7 @@ target_link_libraries(grpc_csharp_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_csharp_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11015,7 +11015,7 @@ target_link_libraries(grpc_node_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_node_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_node_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11055,7 +11055,7 @@ target_link_libraries(grpc_objective_c_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_objective_c_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11095,7 +11095,7 @@ target_link_libraries(grpc_php_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_php_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_php_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11135,7 +11135,7 @@ target_link_libraries(grpc_python_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_python_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_python_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11175,7 +11175,7 @@ target_link_libraries(grpc_ruby_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_ruby_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -17349,6 +17349,10 @@ if(gRPC_INSTALL) - DESTINATION ${gRPC_INSTALL_CMAKEDIR} - NAMESPACE gRPC:: - ) -+ install(EXPORT gRPCPluginTargets -+ DESTINATION ${gRPC_INSTALL_CMAKEDIR} -+ NAMESPACE gRPC:: -+ ) - endif() - - include(CMakePackageConfigHelpers) --- -2.30.2 - diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch deleted file mode 100644 index ab46897b1..000000000 --- a/meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d39489045b5aa73e27713e3cbacb8832c1140ec8 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Wed, 9 Aug 2023 13:33:45 +0800 -Subject: [PATCH] fix CVE-2023-32732 - -CVE: CVE-2023-32732 - -Upstream-Status: Backport [https://github.com/grpc/grpc/pull/32309/commits/6a7850ef4f042ac26559854266dddc79bfbc75b2] -The original patch is adjusted to fit the current 1.50.1 version. - -Signed-off-by: Chen Qi ---- - .../ext/transport/chttp2/transport/hpack_parser.cc | 10 +++++++--- - src/core/ext/transport/chttp2/transport/internal.h | 2 -- - src/core/ext/transport/chttp2/transport/parsing.cc | 6 ++---- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -index f2e49022dc3..cd459d15238 100644 ---- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc -+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -@@ -1211,12 +1211,16 @@ class HPackParser::Parser { - "). GRPC_ARG_MAX_METADATA_SIZE can be set to increase this limit.", - *frame_length_, metadata_size_limit_); - if (metadata_buffer_ != nullptr) metadata_buffer_->Clear(); -+ // StreamId is used as a signal to skip this stream but keep the connection -+ // alive - return input_->MaybeSetErrorAndReturn( - [] { - return grpc_error_set_int( -- GRPC_ERROR_CREATE_FROM_STATIC_STRING( -- "received initial metadata size exceeds limit"), -- GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED); -+ grpc_error_set_int( -+ GRPC_ERROR_CREATE_FROM_STATIC_STRING( -+ "received initial metadata size exceeds limit"), -+ GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED), -+ GRPC_ERROR_INT_STREAM_ID, 0); - }, - false); - } -diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h -index 4a2f4261d83..f8b544d9583 100644 ---- a/src/core/ext/transport/chttp2/transport/internal.h -+++ b/src/core/ext/transport/chttp2/transport/internal.h -@@ -542,8 +542,6 @@ struct grpc_chttp2_stream { - - grpc_core::Timestamp deadline = grpc_core::Timestamp::InfFuture(); - -- /** saw some stream level error */ -- grpc_error_handle forced_close_error = GRPC_ERROR_NONE; - /** how many header frames have we received? */ - uint8_t header_frames_received = 0; - /** number of bytes received - reset at end of parse thread execution */ -diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc -index 980f13543f6..afe6da190b6 100644 ---- a/src/core/ext/transport/chttp2/transport/parsing.cc -+++ b/src/core/ext/transport/chttp2/transport/parsing.cc -@@ -22,6 +22,7 @@ - #include - - #include -+#include - - #include "absl/base/attributes.h" - #include "absl/status/status.h" -@@ -719,10 +720,7 @@ static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t, - } - grpc_chttp2_parsing_become_skip_parser(t); - if (s) { -- s->forced_close_error = err; -- grpc_chttp2_add_rst_stream_to_next_write(t, t->incoming_stream_id, -- GRPC_HTTP2_PROTOCOL_ERROR, -- &s->stats.outgoing); -+ grpc_chttp2_cancel_stream(t, s, std::exchange(err, absl::OkStatus())); - } else { - GRPC_ERROR_UNREF(err); - } --- -2.34.1 - diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb b/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb similarity index 90% rename from meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb rename to meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb index 45bfcb857..c4dd6b985 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb +++ b/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb @@ -20,13 +20,10 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" # RDEPENDS:${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "90ccf24d22b6fc909a1021ebd89fd8c838467d26" -BRANCH = "v1.50.x" +SRCREV_grpc = "c0d1c393d9365664d47df41746e992ae97b651ef" +BRANCH = "v1.56.x" SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ - file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ - file://0001-cmake-add-separate-export-for-plugin-targets.patch \ file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ - file://0001-fix-CVE-2023-32732.patch \ " # Fixes build with older compilers 4.8 especially on ubuntu 14.04 CXXFLAGS:append:class-native = " -Wl,--no-as-needed" From patchwork Wed Sep 27 08:42:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 31229 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 5391DE810B1 for ; Wed, 27 Sep 2023 08:42:58 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web11.13272.1695804172335178684 for ; Wed, 27 Sep 2023 01:42:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=h3FwVpSP; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: peron.clem@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4064876e8b8so1182105e9.0 for ; Wed, 27 Sep 2023 01:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695804170; x=1696408970; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PjkVn+V4RtoheDFfgX18yaQOeof5kEMsufqHi6D5v2E=; b=h3FwVpSP/ZPjSunfF3l8dsegkh2TpiAsneEPDpxwoFiXrtSmwSYR3/A22jtlvFpp8w SoYezqTPjpDXK8S9620uDQ0ZlzD2hwUvfjd/51p5brSFUa0Tc9qriFw63duwB95drnnA saCsKAvrdrU+jqzO/fEsYEiD4H1+dsZyuGsfLrKPw/1cIwYhfE+OWBJpX3frBql2PG2o 4D4OYafTZGXdOnTRSkC9YVJG1yN1IAhX3zEF6kC9vK7rcxU/f6s0vkTN4czokum2KsJb AuAe9QuV/i//CRqap8bkzj4hjl+ItZNDEeINd/xmPlfVmGSOIszPUBwj3T3znwolES9M VGfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695804170; x=1696408970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PjkVn+V4RtoheDFfgX18yaQOeof5kEMsufqHi6D5v2E=; b=YSt1pQDKYHfBSIBaU4V22D4Z2Dh6IrvYXRa00Q2BpfIJvz/1kI1PCjIifTR7C7IuNb gVfLUDhdsQnN1VFCtBf7y/cF1iusw55HebEuk1z8kykALxsHG6oJ1arkUMKa2pbFbch3 8FzB0g2/bBAJ3HIhjDCxewum8A+iuFPDnlecbwOsvUlHbIHCApn34EyVyh+8zfTfLjPg IrF1rGkT8xcuQll+yI6DVv0TxPTCupk12gZEu3rQsfcKGqqKdbAz2zvkcaIZEiysadV9 ezx4KsRBjnOnyWWUtEBYXGStREMegfz50zzL7aMw9ip327mzmwdsLOX2wHybJC5Cm+Yq hnBA== X-Gm-Message-State: AOJu0YylpMX6PfK1pJfcehFs6yH5gZ0adyjJHtUtNNvvNmUoLHguqNR3 fN6bRRcLjFfDffQe/W0OAv/KJ+MM06A= X-Google-Smtp-Source: AGHT+IEYj3+nYE7IjBwVETz0mu8DCs+OB+ip1m6ikgpMF4tqqQkoO6veR7WOQMEmahHAM9vBO2fABQ== X-Received: by 2002:a05:600c:2252:b0:3fe:4548:1892 with SMTP id a18-20020a05600c225200b003fe45481892mr1343484wmm.16.1695804170096; Wed, 27 Sep 2023 01:42:50 -0700 (PDT) Received: from firmware-builder.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id c24-20020a7bc858000000b004030c778396sm20008616wml.4.2023.09.27.01.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 01:42:49 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Subject: [PATCH v3 5/9] etcd-cpp-apiv3: upgrade 0.14.3 -> 0.15.3 Date: Wed, 27 Sep 2023 10:42:38 +0200 Message-Id: <20230927084242.1195772-6-peron.clem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927084242.1195772-1-peron.clem@gmail.com> References: <20230927084242.1195772-1-peron.clem@gmail.com> MIME-Version: 1.0 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, 27 Sep 2023 08:42:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105180 Signed-off-by: Clément Péron --- .../etcd/{etcd-cpp-apiv3_0.14.3.bb => etcd-cpp-apiv3_0.15.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-extended/etcd/{etcd-cpp-apiv3_0.14.3.bb => etcd-cpp-apiv3_0.15.3.bb} (91%) diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb similarity index 91% rename from meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb rename to meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb index 71744026d..d724abc3c 100644 --- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" SRC_URI += "git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https" -SRCREV = "5e2884f36276e44f683fa02fca39807716fdbc16" +SRCREV = "e31ac4d4caa55fa662e207150ba40f8151b7ad96" inherit cmake From patchwork Wed Sep 27 08:42:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 31233 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 5F224E810B5 for ; Wed, 27 Sep 2023 08:42:58 +0000 (UTC) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.groups.io with SMTP id smtpd.web11.13273.1695804174127169351 for ; Wed, 27 Sep 2023 01:42:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JotiD8Nm; spf=pass (domain: gmail.com, ip: 209.85.128.42, mailfrom: peron.clem@gmail.com) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-405621baba7so76657315e9.0 for ; Wed, 27 Sep 2023 01:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695804172; x=1696408972; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+eE+ZfA1l7C6pBaOBr0zdLh15uFi90zQLrHll5qxxuA=; b=JotiD8NmBK+G13O59cqfTlwGYbA2bPYz8b3vFlGlnNnzLPNhX59xXhat0n+/XryHUA XTk8NIOMDvUrTZFgQHbU1vNb4L/fF11oG3cA9jsFaZor3856j+XHB1CwOpzTqQeWphw4 zhyO7Dmxy+LEMoRgmB2h2zOQevm71kk4UTCSQexTFq9h0y71MwAaz/v4Coc1TrdS6LGi pWFKJI2lD5XyFcJLxzaFixOXUIebs1ICe4A9zal/bNjUHUFUpChi8ZSSplfK0ZUZxMPM MSBFrgwnOL6YnaBeZWQYzR3xcMey7Lt3WRDpBiw0KGi9cabMNL53q+pThiR970lDXO5K QkwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695804172; x=1696408972; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+eE+ZfA1l7C6pBaOBr0zdLh15uFi90zQLrHll5qxxuA=; b=IrDnD6oFddI/YnwvYbFJC3s2EfBw+0nnQ+twH6iKTI4wh4QynZh4UDWfKNdWVZmIUY lwIjhOO/5yyGYYdVyZ/bLaVqrWtRDGJAfvcwqTgMX/ftzrYGc3SIPYwmmquRIqi1lX7G bFiDQ04+pRt21zJ08P8by1+PYL7dgBjDV9IwhMAJeWwxKiwcbb35+5pS0kMfxIv0qLM/ RxiHEWNimrkv1QhDVFuwtv1qgrrJYxleB6Ld+GbePyft6Hjiv7L8w43Cfa5SdEYrkuZN jvNcRdq1dDcvUJM/N6VK6u3hoEvfoIMWsov6xVQ/h167Amo1BiWXny/yXUxO0X0brR8w U3vg== X-Gm-Message-State: AOJu0YyHQkJAsplBCZgo3OmeE/Denh6tY+dJoRsH9qjm0+HjLxT5lQ1r +1bWaVTePyaTqo+c+SA4tgbz+pOtCcI= X-Google-Smtp-Source: AGHT+IFUG6sXjUSy5iiq0BJGbLDmwgmh54ZUOARNQvJXXwJL+eQqwEPRPGPFd8Zhpo/helM1LV6c4A== X-Received: by 2002:a1c:7c17:0:b0:401:d947:c8a9 with SMTP id x23-20020a1c7c17000000b00401d947c8a9mr1654811wmc.19.1695804171782; Wed, 27 Sep 2023 01:42:51 -0700 (PDT) Received: from firmware-builder.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id c24-20020a7bc858000000b004030c778396sm20008616wml.4.2023.09.27.01.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 01:42:50 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Subject: [PATCH v3 6/9] etcd-cpp-apiv3: fix build when gRPC is cross compiled Date: Wed, 27 Sep 2023 10:42:39 +0200 Message-Id: <20230927084242.1195772-7-peron.clem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927084242.1195772-1-peron.clem@gmail.com> References: <20230927084242.1195772-1-peron.clem@gmail.com> MIME-Version: 1.0 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, 27 Sep 2023 08:42:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105181 Signed-off-by: Clément Péron --- .../0001-cmake-fix-when-cross-compiling.patch | 66 +++++++++++++++++++ .../etcd/etcd-cpp-apiv3_0.15.3.bb | 6 +- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch new file mode 100644 index 000000000..d1126aa05 --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch @@ -0,0 +1,66 @@ +From cb79329010d73e36ce64830914005f1c17f8f53c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= +Date: Sat, 23 Sep 2023 11:32:18 +0200 +Subject: [PATCH] cmake: fix when cross compiling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In order to generate protobuf files CMake need to use the protoc +and grpc-cpp-plugin compiled for the host architecture. + +Unfortunately, the protoc and grpc-cpp-plugin in the gRPC CMake +configuration file are the one for the target architecture. + +Fix this by properly finding the correct executable when +CMake is cross compiling. + +Signed-off-by: Clément Péron +--- + CMakeLists.txt | 28 ++++++++++++++++++++++++++-- + 1 file changed, 26 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5aa1310..80ebad2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,10 +120,34 @@ if(Protobuf_PROTOC_EXECUTABLE) + endif() + endif() + ++# When cross compiling we look for the native protoc compiler ++# overwrite protobuf::protoc with the proper protoc ++if(CMAKE_CROSSCOMPILING) ++ find_program(Protobuf_PROTOC_EXECUTABLE REQUIRED NAMES protoc) ++ if(NOT TARGET protobuf::protoc) ++ add_executable(protobuf::protoc IMPORTED) ++ endif() ++ set_target_properties(protobuf::protoc PROPERTIES ++ IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}") ++endif() ++ + find_package(gRPC QUIET) +-if(gRPC_FOUND AND TARGET gRPC::grpc AND TARGET gRPC::grpc_cpp_plugin) ++if(gRPC_FOUND AND TARGET gRPC::grpc) ++ # When cross compiling we look for the native grpc_cpp_plugin ++ if(CMAKE_CROSSCOMPILING) ++ find_program(GRPC_CPP_PLUGIN REQUIRED NAMES grpc_cpp_plugin) ++ if(NOT TARGET gRPC::grpc_cpp_plugin) ++ add_executable(gRPC::grpc_cpp_plugin IMPORTED) ++ endif() ++ set_target_properties(gRPC::grpc_cpp_plugin PROPERTIES ++ IMPORTED_LOCATION "${GRPC_CPP_PLUGIN}") ++ elseif(TARGET gRPC::grpc_cpp_plugin) ++ get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) ++ else() ++ message(FATAL_ERROR "Found gRPC but no gRPC CPP plugin defined") ++ endif() ++ + set(GRPC_LIBRARIES gRPC::gpr gRPC::grpc gRPC::grpc++) +- get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) + get_target_property(GRPC_INCLUDE_DIR gRPC::grpc INTERFACE_INCLUDE_DIRECTORIES) + else() + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGRPC.cmake) +-- +2.39.3 (Apple Git-145) + diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb index d724abc3c..e8299bab5 100644 --- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb @@ -4,7 +4,11 @@ HOMEPAGE = "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" -SRC_URI += "git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https" +SRC_URI = " \ + git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ + file://0001-cmake-fix-when-cross-compiling.patch \ +" + SRCREV = "e31ac4d4caa55fa662e207150ba40f8151b7ad96" inherit cmake From patchwork Wed Sep 27 08:42:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 31230 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 62165E810B3 for ; Wed, 27 Sep 2023 08:42:58 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web11.13274.1695804174913364726 for ; Wed, 27 Sep 2023 01:42:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Ux/Rh+Rj; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: peron.clem@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-406402933edso20045685e9.2 for ; Wed, 27 Sep 2023 01:42:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695804173; x=1696408973; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sJFLKgkLu1gA5X2qhQfQaAFGdfau3v+T8yd7lc9GWP0=; b=Ux/Rh+RjnqytiunnWhXYrQBNOl7e99FzjlUZjq53zF1i1nG5N6SFgV6i1IOPBHABV6 QyeV30zthjLxj1AWIkxCV5Doic0573LuS1hyP5b/Fd/Ta4JtKeE15//0E0SuBrIrgmJv lEoHdPwH6+Qdw+NsgLjSp0pc9NmIR0jOO1Gj0Lx3Thkxu1etdMk23TpAI+Gz8LOv39L3 5xPBZgOzQuKajU/pCuaIQk0dhUFqE+dL6VIZrI60dnixMOFJm06jC9gwKRJx06HKH9/X 6msYkJW9YTcFah7eNKoYhwOLJCiXp0T4b4HjivyNrn+rhzTxavj5mz8HmS4BZu598WIu BjHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695804173; x=1696408973; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sJFLKgkLu1gA5X2qhQfQaAFGdfau3v+T8yd7lc9GWP0=; b=ZgiScDMTQG/hAhtPxLvqGjigHtWVrrycAmJhgGjorbh9gccG2yAfMU3lkWvIyFcoLB nCEDEwfYTquwj8Q3YSdQ2kis5or+7tvn2YZYGn+EfJBffC+inIbFQc9NXkXa8ouN7Qyf +jG8QKfaP7ehYJ8RPSx3OZD2+/pt7WewagGRGeDrWedIO0MqzCFWnl4s1miTxk8DYScA xInzY7hB6U0WSU8zwSJln34mwcTsLkdMjq9O91Mw/CwEwXEL9x8RL51C88SO+TOz4/8Z RjT9AHJNIYoJ/NdIOFyCa5VZ9j5n1EbrLmp+xZBgTevtuWk54fA+1chE6AmVipNI/sYt dHKg== X-Gm-Message-State: AOJu0YyJK0S3/jZwNAkBsd4ozNksvqpB9dnPSDSZ6qkpzKK2Nz7/Aemw D2qKaPlggUmtaYCxCWQ7KzDNnmbl4c4= X-Google-Smtp-Source: AGHT+IGC21OUH4d9B3UabNHKe7/PrKdh9AkztNck5K1FxrQmI4j7MnclrIfy9mvWCLTgdzwRE57tTw== X-Received: by 2002:a7b:c4d9:0:b0:401:5443:5591 with SMTP id g25-20020a7bc4d9000000b0040154435591mr1261776wmk.20.1695804172370; Wed, 27 Sep 2023 01:42:52 -0700 (PDT) Received: from firmware-builder.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id c24-20020a7bc858000000b004030c778396sm20008616wml.4.2023.09.27.01.42.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 01:42:51 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Subject: [PATCH v3 7/9] protobuf: upgrade 4.22.2 -> 4.23.4 Date: Wed, 27 Sep 2023 10:42:40 +0200 Message-Id: <20230927084242.1195772-8-peron.clem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927084242.1195772-1-peron.clem@gmail.com> References: <20230927084242.1195772-1-peron.clem@gmail.com> MIME-Version: 1.0 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, 27 Sep 2023 08:42:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105182 Bump protobuf to 4.23.4 to fix build with musl. Signed-off-by: Clément Péron --- .../0001-Fix-linking-error-with-ld-gold.patch | 69 ------------------- ...{protobuf_4.22.2.bb => protobuf_4.23.4.bb} | 16 +++-- 2 files changed, 10 insertions(+), 75 deletions(-) delete mode 100644 meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch rename meta-oe/recipes-devtools/protobuf/{protobuf_4.22.2.bb => protobuf_4.23.4.bb} (85%) diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch deleted file mode 100644 index 2bc44c898..000000000 --- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch +++ /dev/null @@ -1,69 +0,0 @@ -From a91130bb95528743a3f7253f8fe945b7505047d5 Mon Sep 17 00:00:00 2001 -From: Kyungjik Min -Date: Mon, 28 Dec 2020 15:56:09 +0900 -Subject: [PATCH] Fix linking error with ld-gold - -:Release Notes: - -:Detailed Notes: -https://github.com/protocolbuffers/protobuf/issues/6113 -There's a bug in the CMake build leading it to not use the version -scripts, which hides the problem (because all symbols are now public) -but doesn't solve it properly. - -:Testing Performed: - -:QA Notes: -N/A - -:Issues Addressed: -[PLAT-130467] Fix build error for libgoogleassistant with latest - protobuf-3.11.4 - ---- -Upstream-Status: Pending - - src/libprotobuf-lite.map | 2 ++ - src/libprotobuf.map | 2 ++ - src/libprotoc.map | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/src/libprotobuf-lite.map b/src/libprotobuf-lite.map -index 391554669..a1853ca6c 100644 ---- a/src/libprotobuf-lite.map -+++ b/src/libprotobuf-lite.map -@@ -3,6 +3,8 @@ - extern "C++" { - *google*; - }; -+ scc_info_*; -+ descriptor_table_*; - - local: - *; -diff --git a/src/libprotobuf.map b/src/libprotobuf.map -index 391554669..a1853ca6c 100644 ---- a/src/libprotobuf.map -+++ b/src/libprotobuf.map -@@ -3,6 +3,8 @@ - extern "C++" { - *google*; - }; -+ scc_info_*; -+ descriptor_table_*; - - local: - *; -diff --git a/src/libprotoc.map b/src/libprotoc.map -index 391554669..a1853ca6c 100644 ---- a/src/libprotoc.map -+++ b/src/libprotoc.map -@@ -3,6 +3,8 @@ - extern "C++" { - *google*; - }; -+ scc_info_*; -+ descriptor_table_*; - - local: - *; diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_4.22.2.bb b/meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb similarity index 85% rename from meta-oe/recipes-devtools/protobuf/protobuf_4.22.2.bb rename to meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb index b97da6ea6..1edc21cdf 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_4.22.2.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb @@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib abseil-cpp" DEPENDS:append:class-target = " protobuf-native" -SRCREV = "81f89d509d6771dcccb619cbe26ac86cec472582" +SRCREV = "2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a" -SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=22.x;protocol=https \ +SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=23.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 \ " SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " @@ -51,13 +50,18 @@ do_compile_ptest() { cp ${S}/${TEST_SRC_DIR}/*.proto "${B}/${TEST_SRC_DIR}/" cp ${S}/${TEST_SRC_DIR}/*.py "${B}/${TEST_SRC_DIR}/" cp ${S}/${TEST_SRC_DIR}/Makefile "${B}/${TEST_SRC_DIR}/" + # Adapt protobuf.pc 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|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: -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" + # Adapt uf8_range.pc + cp "${B}/third_party/utf8_range/utf8_range.pc" "${B}/${TEST_SRC_DIR}/utf8_range.pc" + sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc" + sed -e 's|Libs:|Libs= -L${B}/third_party/utf8_range |' -i "${B}/${TEST_SRC_DIR}/utf8_range.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 Sep 27 08:42:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 31236 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 71C79E810B9 for ; Wed, 27 Sep 2023 08:42:58 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web11.13276.1695804177144924586 for ; Wed, 27 Sep 2023 01:42:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hkmIoie0; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: peron.clem@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-405361bb93bso103326705e9.3 for ; Wed, 27 Sep 2023 01:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695804174; x=1696408974; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SP2H9xhJY8AmzBVL4N9FAlhUAZHTNP6KSDolOciJCO0=; b=hkmIoie0d7LO8BuAhCdSEODzePaOCUvnfLAKGGfNt2RURb7t+JJqmZbDVvs4tC5/EO gI/GffkCqwrwOg3BweS0UlPH6hilvEGD8kubzNSMnaBurXVnk1NuSDM+CY9JLSfR2FaL qX662glHF9tIUuk8RW5t3i8yYTnaH098ZKCj5MK1olwLmBaqAF/ykmz2jNoZyahVWtjp GPaGYSxO3d57qW8wqXZ1v6dA06wlypr9OHtH1UWhPvFatxbmZKr25XoPCa9nYG1lwifN T7+5nkBi5+ZPr82YXKar5CiuTH5p6y41A9usi7KLyYn+wsYZMRIbVRIj9nCAOwp9RrDa t1wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695804174; x=1696408974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SP2H9xhJY8AmzBVL4N9FAlhUAZHTNP6KSDolOciJCO0=; b=GBoOj+vUar3Pm7WOCpRcSJKq42sZ2me8ALbiCroow1wFrLk8GOr2KDA0pIdcLfoXDA 7EZIfYX4rND659TUp9nk3S1q6zWiEG8y8g2hMl5box036bX50AuAz/A7rs2QH7OD8nLH 5eC5O4kdRxkMq79y0F6+SGONeqYIyO76jj53O4e/Hzs6GBgb19+O8z0xiVF5/a/bR0Q3 kj4Nj9gA7wiUuKgq5D6ximrGSHkNvHPljXLb7JmBUws963uYpKQiY1p2HTCrtuzQqqVw a5Ocyo3f9taBhRxRc9/ZL6VCcoavvj3ohM3RA249j06O40ZzX9xPO5BhUVe7muvKYDLG cMIA== X-Gm-Message-State: AOJu0YwhJ1Ll+bkVsY0M54+ZxxB4DU2kwQOiajum/zgTaiNPZip6H43o JA8RcaZt/Kkc4rZrlFVR13s1lleL3P8= X-Google-Smtp-Source: AGHT+IEGe4eHWDQy8304ypO0cg8m8X2b/xXxRmhRs4lgZOD/76fCYjhJj6CRDbI78A+3tO8arAxvxg== X-Received: by 2002:a7b:cd0c:0:b0:405:9666:5242 with SMTP id f12-20020a7bcd0c000000b0040596665242mr1400257wmj.31.1695804174166; Wed, 27 Sep 2023 01:42:54 -0700 (PDT) Received: from firmware-builder.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id c24-20020a7bc858000000b004030c778396sm20008616wml.4.2023.09.27.01.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 01:42:52 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Subject: [PATCH v3 8/9] protobuf-c: bump to next release to support protobuf 4.23.x Date: Wed, 27 Sep 2023 10:42:41 +0200 Message-Id: <20230927084242.1195772-9-peron.clem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927084242.1195772-1-peron.clem@gmail.com> References: <20230927084242.1195772-1-peron.clem@gmail.com> MIME-Version: 1.0 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, 27 Sep 2023 08:42:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105183 Signed-off-by: Clément Péron --- ...ot-compile-the-code-which-was-genera.patch | 91 ++--- .../0001-add-support-of-protobuf-4.22.x.patch | 315 ------------------ .../protobuf/protobuf-c_1.4.1.bb | 6 +- 3 files changed, 27 insertions(+), 385 deletions(-) delete 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 index 4450a2f62..896a568e1 100644 --- 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 @@ -1,4 +1,4 @@ -From c263360d4f40beb2badd04e5bd084f46fd25595b Mon Sep 17 00:00:00 2001 +From 62b2fd0a150133b6439f6537cb1762d35f5790ee 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 @@ -12,25 +12,27 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Xiangyu Chen --- - Makefile.am | 116 ++++++++++++++++++++++++++-------------------------- - 1 file changed, 58 insertions(+), 58 deletions(-) + Makefile.am | 75 ----------------------------------------------------- + 1 file changed, 75 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 3b0d1d6..ff4c196 100644 +index ff12664..7412aef 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -136,64 +136,64 @@ else +@@ -136,81 +136,6 @@ else LOG_COMPILER = $(VALGRIND) -check_PROGRAMS += \ - t/generated-code/test-generated-code \ - t/generated-code2/test-generated-code2 \ +- t/generated-code3/test-generated-code3 \ - t/version/version - -TESTS += \ - t/generated-code/test-generated-code \ - t/generated-code2/test-generated-code2 \ +- t/generated-code3/test-generated-code3 \ - t/version/version - -t_generated_code_test_generated_code_SOURCES = \ @@ -46,6 +48,16 @@ index 3b0d1d6..ff4c196 100644 -t_generated_code2_test_generated_code2_LDADD = \ - protobuf-c/libprotobuf-c.la - +-t_generated_code3_test_generated_code3_CPPFLAGS = \ +- -DPROTO3 +- +-t_generated_code3_test_generated_code3_SOURCES = \ +- t/generated-code/test-generated-code.c \ +- t/test-proto3.pb-c.c +- +-t_generated_code3_test_generated_code3_LDADD = \ +- protobuf-c/libprotobuf-c.la +- -noinst_PROGRAMS += \ - t/generated-code2/cxx-generate-packed-data - @@ -72,6 +84,9 @@ index 3b0d1d6..ff4c196 100644 -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/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.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-proto3.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 - @@ -80,68 +95,12 @@ index 3b0d1d6..ff4c196 100644 - 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/test-proto3.pb-c.c t/test-proto3.pb-c.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 - +- + t_version_version_SOURCES = \ + t/version/version.c + t_version_version_LDADD = \ -- 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 deleted file mode 100644 index 075b7044c..000000000 --- a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-add-support-of-protobuf-4.22.x.patch +++ /dev/null @@ -1,315 +0,0 @@ -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 86d83e9cc..1d9ca9daa 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,12 +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 \ - file://0001-add-support-of-protobuf-4.22.x.patch \ - " +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=next;protocol=https" SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch" -SRCREV = "abc67a11c6db271bedbb9f58be85d6f4e2ea8389" +SRCREV = "ba4c55f0e686e0252c451f7163ab529e4b36831a" S = "${WORKDIR}/git" From patchwork Wed Sep 27 08:42:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 31234 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 71CECE810BA for ; Wed, 27 Sep 2023 08:42:58 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web10.13087.1695804177644460083 for ; Wed, 27 Sep 2023 01:42:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=E63ZxSxl; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: peron.clem@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-40566f89f6eso76423485e9.3 for ; Wed, 27 Sep 2023 01:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695804175; x=1696408975; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kGq/gTXzgs6eu+wttpcXR8qZ9IdmIuBrtSQFWgRcytI=; b=E63ZxSxlVIyb8eO6YhBTy9VfeWWlptaGJx893ucW4/hURxV5U285fB7WDl22QucFd9 hSJD5yaox5Fn9pyiQFYaNQ3zxqk7/kLJxZLRdll36NaD2Kzqtyan+mHoixY7wWvmenG/ ravgSpqgEX9u0RK7jpwyQQTi5nvMJl5y+0kSBRBeWIrKOWox1V26ysF3NQzw1r06en6V UTmakpTofhWfunDQF+R+2wUOuU0eASYjfv5c7LHbcCzppHwvjwn7Nhmln4qibPMG0iPB ouHPitiDVtyH5AmbLcezPcIp4HuYvJ+VRfUXt6uNiqiDtuFsecImbeDk1Gbqhl/Kx7yF NkSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695804175; x=1696408975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kGq/gTXzgs6eu+wttpcXR8qZ9IdmIuBrtSQFWgRcytI=; b=sbkUIA6gmpTr5fyxDZZomapiJSByc8rUT3Ahe01KOl/tQ/cSADN8b8aHlYWUiMDqBX aAlciK6WjQ+53M/tdIvdqDlE8mSuEfPfWCamUecyynvZZo9fJTqA8vml/Tx9yxRt6og8 EJhXhkJh4kzyQzy74gIX4+zNlyyhHS28vOafmtBCwbvmhm9/LqmDRZKLwBaW78/6l14x epOl/BepYwnKuLrLrJ4iCAU/D2hL2nePc0Jakc4TOjdZ8DQWWtP2CX5AaM4tk637oaJU b3cTnICIS/jWwobpYC3vvK1KBcr7Kr4BNnKcQ4PrPIkE/qBaEyu6IKfaP5TJXHeNeK4b 5IZg== X-Gm-Message-State: AOJu0YyotDNllJzHi+S4ni3Wa3+B7zMDHdjMzqiPdP6vHSlwi1eRO4Xs KVl9Dqhw9XiMXPCG453BrybxiYAADFE= X-Google-Smtp-Source: AGHT+IGBJQpinxLFupEl0on66ssFA3esvswvKZ7KXy4zsdvZsm8jCQZfs+TmOiKdiDwJS8Z04nRhWA== X-Received: by 2002:a05:600c:210d:b0:405:3466:6b8 with SMTP id u13-20020a05600c210d00b00405346606b8mr1586088wml.12.1695804175452; Wed, 27 Sep 2023 01:42:55 -0700 (PDT) Received: from firmware-builder.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id c24-20020a7bc858000000b004030c778396sm20008616wml.4.2023.09.27.01.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 01:42:54 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Subject: [PATCH v3 9/9] mariadb: add missing in rocksdb string_util.h Date: Wed, 27 Sep 2023 10:42:42 +0200 Message-Id: <20230927084242.1195772-10-peron.clem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927084242.1195772-1-peron.clem@gmail.com> References: <20230927084242.1195772-1-peron.clem@gmail.com> MIME-Version: 1.0 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, 27 Sep 2023 08:42:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105184 Signed-off-by: Clément Péron --- ...Add-missing-includes-cstdint-and-cstdio.patch | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch index 12fbd7597..f8ccb998b 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -15,7 +15,8 @@ Signed-off-by: Mingli Yu storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + storage/rocksdb/rocksdb/util/slice.cc | 1 + - 4 files changed, 4 insertions(+) + storage/rocksdb/rocksdb/util/string_util.h | 1 + + 5 files changed, 5 insertions(+) diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h index 963c1d8e..73487edd 100644 @@ -65,6 +66,19 @@ index 6db11cc9..c26b6a21 100644 #include "rocksdb/slice_transform.h" #include "rocksdb/slice.h" #include "util/string_util.h" + +diff --git a/util/string_util.h b/util/string_util.h +index 55d106fff02..11178fd1d7b 100644 +--- a/storage/rocksdb/rocksdb/util/string_util.h ++++ b/storage/rocksdb/rocksdb/util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include + #include + #include + #include -- 2.25.1