From patchwork Thu Nov 7 19:16:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 2008137 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XksL83wkhz1xxq for ; Fri, 8 Nov 2024 06:18:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5D85384456; Thu, 7 Nov 2024 19:18:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id tZ13eaJmdLhh; Thu, 7 Nov 2024 19:18:18 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A267584457 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp1.osuosl.org (Postfix) with ESMTP id A267584457; Thu, 7 Nov 2024 19:18:18 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists1.osuosl.org (Postfix) with ESMTP id 29AB5C1 for ; Thu, 7 Nov 2024 19:18:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0A9F441E82 for ; Thu, 7 Nov 2024 19:18:13 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id JUmLaPdGcBUe for ; Thu, 7 Nov 2024 19:18:11 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::d31; helo=mail-io1-xd31.google.com; envelope-from=james.hilliard1@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org CAEF441D84 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CAEF441D84 Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by smtp4.osuosl.org (Postfix) with ESMTPS id CAEF441D84 for ; Thu, 7 Nov 2024 19:18:10 +0000 (UTC) Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-83ab21c26f1so47518839f.2 for ; Thu, 07 Nov 2024 11:18:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731007089; x=1731611889; 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=nx6au2Z5MH79fAgczMDg5JLWLVUGRG8ho5F2LNUcSc8=; b=qG7f27xo6jAAU2Y1JjA6h8uZCK+xzCzrUMXTXBRgoPTqBm8ZxKdBEQsPODdtS1oCDe CcAjHNRCNknjZSWlOKBXTv9wkfVZMg7cqo51MWdHIj320UtxruQ1wgEAkQeH2imNfqOP BA0g5uNnx6pcgXZ0FufOn33k9NGLJHL+IvKWXZgqIUBm6TChs6+k0xODHtlyr7J+kz3F TLdKuvQKyq9tbWt4YHbWTUOL0LZk0qSM8HhnpaMwSEVcF/XfuwYTf7I/dRyoCFw7Iymv PTkEbmW5vYaN5zXPcknJsG4hDrtt/l3HG/jyNl+X06PpwNclxpCL2Y42GVLIx98mRQe6 50bA== X-Gm-Message-State: AOJu0YxCaptL6LoYKTKRyNQfMMosnl5FjNZtaZShWmxXxZjVXlCmBmM6 DlxLZUVoZFvpCaOnTsixiwEv4W7bXz47T/oW3ayRuRfSswHaxNWLk7dwHA== X-Google-Smtp-Source: AGHT+IGpUBc20i114n3kHwASdRHG3B7z7Ph2MSDahni/wO6qDiPd9J7Sx3ax+OfoyNC7z31FBDPbLw== X-Received: by 2002:a05:6602:6013:b0:83a:b33a:2f2e with SMTP id ca18e2360f4ac-83dff81b4afmr55293639f.14.1731007089369; Thu, 07 Nov 2024 11:18:09 -0800 (PST) Received: from james-x399.localdomain (97-118-149-1.hlrn.qwest.net. [97.118.149.1]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de5f8cdd00sm441546173.108.2024.11.07.11.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2024 11:18:08 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Thu, 7 Nov 2024 12:16:33 -0700 Message-Id: <20241107191634.378670-3-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107191634.378670-1-james.hilliard1@gmail.com> References: <20241107191634.378670-1-james.hilliard1@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731007089; x=1731611889; darn=buildroot.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=nx6au2Z5MH79fAgczMDg5JLWLVUGRG8ho5F2LNUcSc8=; b=PZK8EFok8lsus8Lq2lBuG4UypzwFqQCVFKWUUTUNQ1KYV0amUbb/rv4DRPsj15fp/d 3LHfGFUrWX+sMp4xUcRmB+wUmfsPhb0NUEIo8mHJihOB4zvXif2qCMaKMa1AfyktSM+1 SwHs4GYMNVQ9tlnnHATthN3JcQuG/BHVn+2pln3vmilmxQRnprSd5oO4kER+IiTt7HGN ld05oNla65W9ywec+ZS5mrxetrFz804W/b6CH1ZqecEhfJxLl00V4kZpMkN9G4ExHBSx 57Ov6f5HfL9LcPhhKySyUv9n3RoKy6s7EeIUAnYYmL2SaFgIcXBsVdPd+shxQGfZon76 hhRw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=PZK8EFok Subject: [Buildroot] [PATCH v5 3/4] package/grpc: bump to version 1.66.1 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcus Folkesson , Kamel Bouhara , Marcin Niestroj , Julien Olivain , Asaf Kahlon , James Hilliard , Woodrow Douglass , Christian Stewart , Robert Rose , Fabrice Fontaine Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Add new -DgRPC_BUILD_CODEGEN=OFF config option which is required if no plugins are enabled. Drop no longer relevant add GPR_DISABLE_WRAPPED_MEMCPY patch. Rebase remaining patches. Signed-off-by: James Hilliard --- .checkpackageignore | 3 +- ...the-availability-of-pthread_setname_.patch | 26 ++--- ...trict-building-of-host-grpc-to-grpc.patch} | 98 ++++++++----------- ...py.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch | 34 ------- ...conditionally-downloading-api-repos.patch} | 21 ++-- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 3 +- 7 files changed, 68 insertions(+), 119 deletions(-) rename package/grpc/{0003-host-grpc-only-cpp-plugin.patch => 0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch} (63%) delete mode 100644 package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch rename package/grpc/{0004-disable-unconditionally-downloading-api-repos.patch => 0003-disable-unconditionally-downloading-api-repos.patch} (62%) diff --git a/.checkpackageignore b/.checkpackageignore index ee075f4cb2..6e8d5228ab 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -557,8 +557,7 @@ package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch. package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream -package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch lib_patch.Upstream -package/grpc/0004-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream +package/grpc/0003-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch lib_patch.Upstream package/guile/0001-calculate-csqrt_manually.patch lib_patch.Upstream package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch lib_patch.Upstream diff --git a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch index 92dc5a6c45..e8e211758a 100644 --- a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch +++ b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch @@ -1,4 +1,4 @@ -From 0dfb289a3b362b082ac3608d887e42f09dadc0d2 Mon Sep 17 00:00:00 2001 +From dfec50b899c449bc964514f16e94869de7a68896 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 31 Dec 2018 16:22:07 +0100 Subject: [PATCH] Properly detect the availability of pthread_setname_np() @@ -20,15 +20,15 @@ Signed-off-by: Thomas Petazzoni ] Signed-off-by: Michael Nosthoff --- - CMakeLists.txt | 6 ++++++ - include/grpc/impl/codegen/port_platform.h | 2 ++ + CMakeLists.txt | 6 ++++++ + include/grpc/support/port_platform.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45c2fcb..0b2be4f 100644 +index 053b9e3784..2565dc5c84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -208,6 +208,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) +@@ -291,6 +291,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") @@ -41,11 +41,11 @@ index 45c2fcb..0b2be4f 100644 if(MSVC) include(cmake/msvc_static_runtime.cmake) add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) -diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h -index 4f213ff..55ecd9d 100644 ---- a/include/grpc/impl/codegen/port_platform.h -+++ b/include/grpc/impl/codegen/port_platform.h -@@ -186,6 +186,7 @@ +diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h +index 5fb7426af2..24d438d702 100644 +--- a/include/grpc/support/port_platform.h ++++ b/include/grpc/support/port_platform.h +@@ -228,6 +228,7 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1 @@ -53,7 +53,7 @@ index 4f213ff..55ecd9d 100644 #ifdef __GLIBC_PREREQ #if __GLIBC_PREREQ(2, 12) #define GPR_LINUX_PTHREAD_NAME 1 -@@ -194,6 +195,7 @@ +@@ -236,6 +237,7 @@ // musl libc & others #define GPR_LINUX_PTHREAD_NAME 1 #endif @@ -61,6 +61,6 @@ index 4f213ff..55ecd9d 100644 #include #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 - -- -2.26.63 +2.34.1 + diff --git a/package/grpc/0003-host-grpc-only-cpp-plugin.patch b/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch similarity index 63% rename from package/grpc/0003-host-grpc-only-cpp-plugin.patch rename to package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch index bfb8713053..82705d8a1e 100644 --- a/package/grpc/0003-host-grpc-only-cpp-plugin.patch +++ b/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch @@ -1,4 +1,4 @@ -From 0f2c73b62bdc612f9d5cdd8e0c765995470d4f8b Mon Sep 17 00:00:00 2001 +From 6aab068a6bd92e215b61eaab61062bf1d97bc065 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 25 May 2021 14:55:23 +0200 Subject: [PATCH] Add option to restrict building of (host-)grpc to @@ -15,17 +15,17 @@ Signed-off-by: Fabrice Fontaine Updated for 1.48.0: Signed-off-by: Michael Nosthoff --- - CMakeLists.txt | 39 +++++++++++++++++++++++++++++++++++---- - 1 file changed, 35 insertions(+), 4 deletions(-) + CMakeLists.txt | 36 +++++++++++++++++++++++++++++++----- + 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0dcae6b1aee5..57b3963a43b0 100644 +index 2565dc5c84..94f8fd3e93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -49,12 +49,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) +@@ -50,12 +50,16 @@ set(gRPC_BUILD_MSVC_MP_COUNT 0 CACHE STRING "The maximum number of processes for + option(gRPC_BUILD_TESTS "Build tests" OFF) option(gRPC_BUILD_CODEGEN "Build codegen" ON) - option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON) - option(gRPC_BACKWARDS_COMPATIBILITY_MODE "Build libraries that are binary compatible across a larger number of OS and libc versions" OFF) + option(gRPC_DOWNLOAD_ARCHIVES "Download archives for empty 3rd party directories" ON) +option(gRPC_BUILD_PLUGIN_SUPPORT_ONLY "Build plugin support only" OFF) set(gRPC_INSTALL_default ON) @@ -39,7 +39,7 @@ index 0dcae6b1aee5..57b3963a43b0 100644 set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL "Generate installation target") -@@ -563,6 +567,8 @@ add_custom_target(plugins +@@ -662,6 +666,8 @@ add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) @@ -48,7 +48,7 @@ index 0dcae6b1aee5..57b3963a43b0 100644 add_custom_target(tools_c DEPENDS ) -@@ -574,6 +580,8 @@ add_custom_target(tools_cxx +@@ -673,6 +679,8 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) @@ -57,15 +57,16 @@ index 0dcae6b1aee5..57b3963a43b0 100644 protobuf_generate_grpc_cpp_with_import_path_correction( src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto ) -@@ -1307,6 +1315,7 @@ if(gRPC_BUILD_TESTS) +@@ -1660,7 +1668,7 @@ if(gRPC_BUILD_TESTS) DEPENDS buildtests_c buildtests_cxx) endif() +- +if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) add_library(address_sorting third_party/address_sorting/address_sorting.c -@@ -1359,6 +1368,8 @@ if(gRPC_INSTALL) +@@ -2855,6 +2863,8 @@ if(gRPC_INSTALL) ) endif() @@ -73,17 +74,17 @@ index 0dcae6b1aee5..57b3963a43b0 100644 + if(gRPC_BUILD_TESTS) - add_library(end2end_tests -@@ -1512,6 +1523,8 @@ target_link_libraries(end2end_tests + add_library(grpc_test_util +@@ -2987,6 +2997,8 @@ endif() endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + - add_library(gpr - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc -@@ -2504,6 +2517,8 @@ if(gRPC_INSTALL) + add_library(grpc_unsecure + src/core/channelz/channel_trace.cc + src/core/channelz/channelz.cc +@@ -3547,6 +3559,8 @@ if(gRPC_INSTALL) ) endif() @@ -91,17 +92,17 @@ index 0dcae6b1aee5..57b3963a43b0 100644 + if(gRPC_BUILD_TESTS) - add_library(grpc_test_util -@@ -2618,6 +2633,8 @@ endif() + add_library(gtest +@@ -3621,6 +3635,8 @@ target_link_libraries(gtest endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + - add_library(grpc_unsecure - src/core/ext/filters/census/grpc_context.cc - src/core/ext/filters/channel_idle/channel_idle_filter.cc -@@ -3102,6 +3119,8 @@ if(gRPC_INSTALL) + add_library(upb_base_lib + third_party/upb/upb/base/status.c + ) +@@ -4108,6 +4124,8 @@ if(gRPC_INSTALL) ) endif() @@ -110,7 +111,7 @@ index 0dcae6b1aee5..57b3963a43b0 100644 if(gRPC_BUILD_TESTS) if(gRPC_BUILD_CODEGEN) -@@ -3185,6 +3204,8 @@ endif() +@@ -4193,6 +4211,8 @@ endif() endif() @@ -119,24 +120,24 @@ index 0dcae6b1aee5..57b3963a43b0 100644 add_library(grpc++ src/core/ext/transport/binder/client/binder_connector.cc src/core/ext/transport/binder/client/channel_create.cc -@@ -3635,6 +3656,7 @@ if(gRPC_INSTALL) +@@ -4684,6 +4704,7 @@ if(gRPC_INSTALL) ) endif() +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY if(gRPC_BUILD_CODEGEN) - add_library(grpc++_reflection -@@ -3889,6 +3911,8 @@ target_link_libraries(grpc++_test_util + add_library(grpc++_reflection ${_gRPC_STATIC_WIN32} +@@ -4967,6 +4988,8 @@ target_link_libraries(grpc++_test_util endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + add_library(grpc++_unsecure + src/cpp/client/call_credentials.cc src/cpp/client/channel_cc.cc - src/cpp/client/client_callback.cc -@@ -4181,6 +4205,7 @@ if(gRPC_INSTALL) +@@ -5707,6 +5730,7 @@ if(gRPC_INSTALL) ) endif() @@ -144,7 +145,7 @@ index 0dcae6b1aee5..57b3963a43b0 100644 add_library(grpc_plugin_support src/compiler/cpp_generator.cc -@@ -4240,7 +4265,7 @@ foreach(_hdr +@@ -5769,7 +5793,7 @@ foreach(_hdr endforeach() @@ -153,25 +154,7 @@ index 0dcae6b1aee5..57b3963a43b0 100644 install(TARGETS grpc_plugin_support EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -4324,6 +4349,8 @@ endif() - - endif() - -+if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) -+ - add_library(upb - third_party/upb/third_party/utf8_range/naive.c - third_party/upb/third_party/utf8_range/range2-neon.c -@@ -4393,6 +4420,8 @@ if(gRPC_INSTALL) - ) - endif() - -+endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY -+ - - if(gRPC_BUILD_TESTS) - -@@ -11085,7 +11114,7 @@ target_link_libraries(grpc_completion_queue_test +@@ -16520,7 +16544,7 @@ target_link_libraries(grpc_completion_queue_test endif() @@ -180,16 +163,16 @@ index 0dcae6b1aee5..57b3963a43b0 100644 add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc -@@ -11115,7 +11144,7 @@ target_link_libraries(grpc_cpp_plugin +@@ -16548,7 +16572,7 @@ target_link_libraries(grpc_cpp_plugin -if(gRPC_INSTALL) +if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) - install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets + install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -23128,7 +23157,7 @@ endif() +@@ -37968,7 +37992,7 @@ endif() @@ -198,12 +181,13 @@ index 0dcae6b1aee5..57b3963a43b0 100644 if(gRPC_INSTALL) install(EXPORT gRPCTargets -@@ -23225,3 +23254,5 @@ generate_pkgconfig( - "-lgrpc++_unsecure" - "" - "grpc++_unsecure.pc") +@@ -38089,3 +38113,5 @@ generate_pkgconfig( + "-lgrpcpp_otel_plugin" + "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib" + "grpcpp_otel_plugin.pc") + +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY +\ No newline at end of file -- -2.43.0 +2.34.1 diff --git a/package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch b/package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch deleted file mode 100644 index aac92bab13..0000000000 --- a/package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch +++ /dev/null @@ -1,34 +0,0 @@ -From be030314805137cd63b46ea6eaa702b608669910 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 2 Jun 2019 17:45:47 +0200 -Subject: [PATCH] wrap_memcpy.cc: add GPR_DISABLE_WRAPPED_MEMCPY - -Add GPR_DISABLE_WRAPPED_MEMCPY to allow the user to disable wrapped -memcpy. This will fix build on x86_64 on musl/uclibc without changing -the cpu behavior. - -Fixes: - - http://autobuild.buildroot.org/results/20d6f2489a4e291a53bd514da66105eb607e1014 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/grpc/grpc/pull/19207] ---- - src/core/lib/gpr/wrap_memcpy.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/lib/gpr/wrap_memcpy.cc b/src/core/lib/gpr/wrap_memcpy.cc -index 9b8608e056..38b76acf95 100644 ---- a/src/core/lib/gpr/wrap_memcpy.cc -+++ b/src/core/lib/gpr/wrap_memcpy.cc -@@ -29,7 +29,7 @@ - extern "C" { - #ifdef __linux__ - #if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) && \ -- !defined(__ANDROID__) -+ !defined(__ANDROID__) && !defined(GPR_DISABLE_WRAPPED_MEMCPY) - __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); - void* __wrap_memcpy(void* destination, const void* source, size_t num) { - return memcpy(destination, source, num); --- -2.20.1 - diff --git a/package/grpc/0004-disable-unconditionally-downloading-api-repos.patch b/package/grpc/0003-disable-unconditionally-downloading-api-repos.patch similarity index 62% rename from package/grpc/0004-disable-unconditionally-downloading-api-repos.patch rename to package/grpc/0003-disable-unconditionally-downloading-api-repos.patch index 967bbf6247..0cd5012b26 100644 --- a/package/grpc/0004-disable-unconditionally-downloading-api-repos.patch +++ b/package/grpc/0003-disable-unconditionally-downloading-api-repos.patch @@ -1,4 +1,4 @@ -From b0599c3d1b52818c79ea8fa5dfdc40a4ce01e454 Mon Sep 17 00:00:00 2001 +From 2a73f6439b6d745b2cbfff120dc7adc555400247 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 22 Jul 2022 08:49:48 +0200 Subject: [PATCH] disable unconditionally downloading api repos @@ -9,31 +9,30 @@ for now. See https://github.com/grpc/grpc/issues/30385 Signed-off-by: Michael Nosthoff - --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 11e7ae2b67..a9062fa6ef 100644 +index 94f8fd3e93..df43d2e193 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -327,6 +327,7 @@ include(cmake/xxhash.cmake) - include(cmake/zlib.cmake) - include(cmake/download_archive.cmake) +@@ -402,6 +402,7 @@ if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN) + include(cmake/opentelemetry-cpp.cmake) + endif() +if(FALSE) # Setup external proto library at third_party/envoy-api with 2 download URLs - if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api) + if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api AND gRPC_DOWNLOAD_ARCHIVES) # Download the archive via HTTP, validate the checksum, and extract to third_party/envoy-api. -@@ -403,6 +404,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds) - xds-cb28da3451f158a947dfc45090fe92b07b243bc1 +@@ -478,6 +479,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds AND gRPC_DOWNLOAD_ARC + xds-3a472e524827f72d1ad621c4983dd5af54c46776 ) endif() +endif() if(WIN32) - set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} ws2_32 crypt32) -- -2.25.1 +2.34.1 diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index e6b76dcb5e..08aada1454 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 grpc-1.51.1.tar.gz +sha256 79ed4ab72fa9589b20f8b0b76c16e353e4cfec1d773d33afad605d97b5682c61 grpc-1.66.1.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 9125b1f9f6..47ebf1997c 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.51.1 +GRPC_VERSION = 1.66.1 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE @@ -29,6 +29,7 @@ GRPC_CONF_OPTS = \ -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \ + -DgRPC_BUILD_CODEGEN=OFF \ -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \