Hi Khem, On Sun, 10 Sept 2023 at 00:28, Khem Raj <[email protected]> wrote:
> seeing a build error in native version > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3103/steps/14/logs/stdio Sorry, I thought to have properly retested but my custom gRPC recipe took priority over the meta-oe one. I have sent a v2. Regards, > > > On Sat, Sep 9, 2023 at 2:35 AM Clément Péron <[email protected]> wrote: > > > > Remove merged patch that export plugin to a separate targets > > > > Remove no more applicatable patch > > > > Signed-off-by: Clément Péron <[email protected]> > > --- > > ...RPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch | 62 ------------- > > ...d-separate-export-for-plugin-targets.patch | 93 ------------------- > > .../grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb} | 6 +- > > 3 files changed, 2 insertions(+), 159 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 > > rename meta-oe/recipes-devtools/grpc/{grpc_1.50.1.bb => grpc_1.56.2.bb} > (92%) > > > > 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 <[email protected]> > > -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 <[email protected]> > > - > > ---- > > -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 <typename Predicate> > > - 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 <[email protected]> > > -Date: Tue, 18 Feb 2020 14:17:07 +0100 > > -Subject: [PATCH] cmake: add separate export for plugin targets > > - > > -Upstream-Status: Submitted [https://github.com/grpc/grpc/pull/29328] > > - > > - > > ---- > > - CMakeLists.txt | 18 +++++++++++------- > > - 1 file changed, 11 insertions(+), 7 deletions(-) > > - > > -diff --git a/CMakeLists.txt b/CMakeLists.txt > > -index efdaf8936d..6608b1b00c 100644 > > ---- a/CMakeLists.txt > > -+++ b/CMakeLists.txt > > -@@ -10935,7 +10935,7 @@ target_link_libraries(grpc_cpp_plugin > > - > > - > > - if(gRPC_INSTALL) > > -- install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets > > -+ install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets > > - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > > - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} > > - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > > -@@ -10975,7 +10975,7 @@ target_link_libraries(grpc_csharp_plugin > > - > > - > > - if(gRPC_INSTALL) > > -- install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets > > -+ install(TARGETS grpc_csharp_plugin EXPORT gRPCPluginTargets > > - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > > - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} > > - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > > -@@ -11015,7 +11015,7 @@ target_link_libraries(grpc_node_plugin > > - > > - > > - if(gRPC_INSTALL) > > -- install(TARGETS grpc_node_plugin EXPORT gRPCTargets > > -+ install(TARGETS grpc_node_plugin EXPORT gRPCPluginTargets > > - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > > - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} > > - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > > -@@ -11055,7 +11055,7 @@ target_link_libraries(grpc_objective_c_plugin > > - > > - > > - if(gRPC_INSTALL) > > -- install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets > > -+ install(TARGETS grpc_objective_c_plugin EXPORT gRPCPluginTargets > > - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > > - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} > > - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > > -@@ -11095,7 +11095,7 @@ target_link_libraries(grpc_php_plugin > > - > > - > > - if(gRPC_INSTALL) > > -- install(TARGETS grpc_php_plugin EXPORT gRPCTargets > > -+ install(TARGETS grpc_php_plugin EXPORT gRPCPluginTargets > > - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > > - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} > > - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > > -@@ -11135,7 +11135,7 @@ target_link_libraries(grpc_python_plugin > > - > > - > > - if(gRPC_INSTALL) > > -- install(TARGETS grpc_python_plugin EXPORT gRPCTargets > > -+ install(TARGETS grpc_python_plugin EXPORT gRPCPluginTargets > > - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > > - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} > > - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > > -@@ -11175,7 +11175,7 @@ target_link_libraries(grpc_ruby_plugin > > - > > - > > - if(gRPC_INSTALL) > > -- install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets > > -+ install(TARGETS grpc_ruby_plugin EXPORT gRPCPluginTargets > > - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} > > - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} > > - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} > > -@@ -17349,6 +17349,10 @@ if(gRPC_INSTALL) > > - DESTINATION ${gRPC_INSTALL_CMAKEDIR} > > - NAMESPACE gRPC:: > > - ) > > -+ install(EXPORT gRPCPluginTargets > > -+ DESTINATION ${gRPC_INSTALL_CMAKEDIR} > > -+ NAMESPACE gRPC:: > > -+ ) > > - endif() > > - > > - include(CMakePackageConfigHelpers) > > --- > > -2.30.2 > > - > > diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb > b/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb > > similarity index 92% > > 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..ac54d704a 100644 > > --- a/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb > > +++ b/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb > > @@ -20,11 +20,9 @@ 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} > <http://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=$%7BBRANCH%7D> > \ > > - > 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 \ > > " > > -- > > 2.34.1 > > > > > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#104827): https://lists.openembedded.org/g/openembedded-devel/message/104827 Mute This Topic: https://lists.openembedded.org/mt/101253581/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
