From patchwork Tue Oct 25 18:24:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nosthoff X-Patchwork-Id: 1694573 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=) 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MxgNK2dK9z1ygr for ; Wed, 26 Oct 2022 05:25:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8F38A8128D; Tue, 25 Oct 2022 18:25:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8F38A8128D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C5ozLU8g_h9c; Tue, 25 Oct 2022 18:25:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id EC03980C58; Tue, 25 Oct 2022 18:25:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org EC03980C58 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 71F0E1BF290 for ; Tue, 25 Oct 2022 18:24:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 4D74480C58 for ; Tue, 25 Oct 2022 18:24:54 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4D74480C58 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XUlKgBis5bdh for ; Tue, 25 Oct 2022 18:24:49 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4775A80C2C Received: from mail.heine.tech (mail.heine.tech [195.201.24.99]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4775A80C2C for ; Tue, 25 Oct 2022 18:24:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 552161814B9; Tue, 25 Oct 2022 20:24:46 +0200 (CEST) To: buildroot@buildroot.org Date: Tue, 25 Oct 2022 20:24:11 +0200 Message-Id: <20221025182419.250668-1-buildroot@heine.tech> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heine.tech; s=dkim; t=1666722286; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding; bh=PgJsVdf3lS6H+cPYczTVDo1rE+HRabq5HhVb9SUvzEw=; b=M/L1iw4nojHQleruKJOnveRhL96RNSE15qjJfsG+eT7XyAhy/B1T68D5Xme8HnpUbklsgM kiZTGsDcZA9gf/LjQupGdYMhUfhUo3wIXv0/PEgyo2wdahTnRGKMxFThlgn/TtwxL16Dyy 5pKCO+iNEYT+VzQohvDd0SdWYhtSv18= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=heine.tech header.i=@heine.tech header.a=rsa-sha256 header.s=dkim header.b=M/L1iw4n Subject: [Buildroot] [PATCH] package/grpc: bump to version 1.50.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Michael Nosthoff via buildroot From: Michael Nosthoff Reply-To: Michael Nosthoff Cc: Robert Rose Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" drop cross-compile patch which is now upstream (again). Signed-off-by: Michael Nosthoff --- ...conditionally-downloading-api-repos.patch} | 0 .../0004-fix-grpc-plugin-cross-compile.patch | 43 ------------------- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 4 files changed, 2 insertions(+), 45 deletions(-) rename package/grpc/{0005-disable-unconditionally-downloading-api-repos.patch => 0004-disable-unconditionally-downloading-api-repos.patch} (100%) delete mode 100644 package/grpc/0004-fix-grpc-plugin-cross-compile.patch diff --git a/package/grpc/0005-disable-unconditionally-downloading-api-repos.patch b/package/grpc/0004-disable-unconditionally-downloading-api-repos.patch similarity index 100% rename from package/grpc/0005-disable-unconditionally-downloading-api-repos.patch rename to package/grpc/0004-disable-unconditionally-downloading-api-repos.patch diff --git a/package/grpc/0004-fix-grpc-plugin-cross-compile.patch b/package/grpc/0004-fix-grpc-plugin-cross-compile.patch deleted file mode 100644 index d4e18a7853..0000000000 --- a/package/grpc/0004-fix-grpc-plugin-cross-compile.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6798193f062676fddf7fee6d0c928f8ce6d92894 Mon Sep 17 00:00:00 2001 -From: Michael Nosthoff -Date: Thu, 21 Jul 2022 22:14:32 +0200 -Subject: [PATCH] cmake: fix cross-compilation with - gRPC_BUILD_GRPC_CPP_PLUGIN=OFF - -commit 99752b173cfa reintroduced the cross-compilation issue which was fixed by da10b795e177 - -upstream PR: https://github.com/grpc/grpc/pull/30378 - -Signed-off-by: Michael Nosthoff - ---- - CMakeLists.txt | 2 +- - templates/CMakeLists.txt.template | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9cad96a12f95..11e7ae2b67df 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -514,7 +514,7 @@ function(protobuf_generate_grpc_cpp_with_import_path_correction FILE_LOCATION IM - --plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN} - ${_protobuf_include_path} - ${REL_FIL} -- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE_LOCATION} ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin -+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE_LOCATION} ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} ${_gRPC_CPP_PLUGIN} - WORKING_DIRECTORY ${_gRPC_PROTO_SRCS_DIR} - COMMENT "Running gRPC C++ protocol buffer compiler for ${IMPORT_PATH}" - VERBATIM) -diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template -index 161cf46798f1..82fe4217913a 100644 ---- a/templates/CMakeLists.txt.template -+++ b/templates/CMakeLists.txt.template -@@ -498,7 +498,7 @@ - --plugin=protoc-gen-grpc=<%text>${_gRPC_CPP_PLUGIN} - <%text>${_protobuf_include_path} - <%text>${REL_FIL} -- DEPENDS <%text>${CMAKE_CURRENT_SOURCE_DIR}/${FILE_LOCATION} <%text>${ABS_FIL} <%text>${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin -+ DEPENDS <%text>${CMAKE_CURRENT_SOURCE_DIR}/${FILE_LOCATION} <%text>${ABS_FIL} <%text>${_gRPC_PROTOBUF_PROTOC} <%text>${_gRPC_CPP_PLUGIN} - WORKING_DIRECTORY <%text>${_gRPC_PROTO_SRCS_DIR} - COMMENT "Running gRPC C++ protocol buffer compiler for <%text>${IMPORT_PATH}" - VERBATIM) diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 9ef976a60a..4d838703cc 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5071b630e2a14707ad060636990f1b25b0984bd168c7ea1ab95e48a3bdc0081f grpc-1.49.1.tar.gz +sha256 76900ab068da86378395a8e125b5cc43dfae671e09ff6462ddfef18676e2165a grpc-1.50.0.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 5f28e86113..9aac241e47 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.49.1 +GRPC_VERSION = 1.50.0 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