From nobody Thu Dec 14 17:03:25 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SrdwF6MFKz52kpR; Thu, 14 Dec 2023 17:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SrdwF5W23z3YVp; Thu, 14 Dec 2023 17:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DXGY+0/QXc5ZSV77/hXtc88Lsk2Bwp80U2Fg1m0nUHc=; b=d8dTK0lp/SwKhmM2H/d8IbiOPw3OSmbWr5zlXXL/N57K4hKKJNwHtI+06f2TLKQjQSU2ZG Br5RsBxrJpVl1utaiZ+6IpCuNdi/WYv2PL0M2sn3MQZEyETQhyxcRBLq+3CRXWmYydUluh WiBL2eQ0iHJSZVmaXwzjqtqUCXgcsyqtULgNlGGsFai0PqSo5hcF5+JJ/Jjtq5sLcBasKR xCwaCcXOB8Fow27XApcPxjU+WzJ/htcztBs2AOWrks8H9lkkCP4nDUUOEjjk7HoD786i7O fARSWXXZtjoOf2YHHVQX9A1qPc6styVAzVg45SnKTqwsr3BpBcwOdoDpI1H1yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573405; a=rsa-sha256; cv=none; b=sXK8aWvGH4LgTsGqX6IboguqdNdXOw1SIAZ+vfa1SOr902DoHST1LeXJmz5zIyU1+1/glq puq5hq+vxNjbcAqbFtdQrX7wtuYz6vaIq0DclhJ0Fph6gZ7u7gh45O29OWPR5YGygrM8VS br2yezAdusBSI9iGdjU+buax7ZyZZxLJ810t3w7UDftlljWemuDtbRY+3iEodcZEOgYfFB kmkkvZ7fqaw9aHTto/gS0HhqJBJ+yZ7XJC3WPeXdX7i2U0IO/8UPra36aIIzcuUKoonE/2 A08p5lhyTG2/2WtRmwp1zQwTMkxOJbqfd428qLH8rRIFkYhAR08WNr00TxjmGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DXGY+0/QXc5ZSV77/hXtc88Lsk2Bwp80U2Fg1m0nUHc=; b=IoyulRefupkbwZgF7L3AKgDtiY1utR2m4i+6BnE7spSzM0+fypxsvfLMXN2wdiXq8CyTm9 S9uXsxCDbMn3M74iQh265s9OfQnWF+d2K5UXVCxRbezYYy4VwsxcWn4ZhFq5ZAiIeaPjFW yz7bIHf4xjiNxt3PtpkjoCS2APlLmA1mcsJeINJseXKNdyh5i6+AHu5fx9i3UR+WAukLEG GXjY8rK4zDe8X9H7ELstQBWCKi4cUfwOU0gw27xQ1PShQ4mgAWTJuhHX+p4YIJEy+Vr6i9 X8JuniPeiHZrxfOr7JblX+B4w1dDm1NNjKlK2SSSFkgVlCp8xKIpanOKaVcvnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SrdwF4RCpzbkS; Thu, 14 Dec 2023 17:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BEH3PUH016612; Thu, 14 Dec 2023 17:03:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3Pub016609; Thu, 14 Dec 2023 17:03:25 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:25 GMT Message-Id: <202312141703.3BEH3Pub016609@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 1957504e5b37 - main - devel/grpc142: Fix build with protobuf 22+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1957504e5b3731a209b2c83890cc68ae57c1e0e6 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1957504e5b3731a209b2c83890cc68ae57c1e0e6 commit 1957504e5b3731a209b2c83890cc68ae57c1e0e6 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:27 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:04 +0000 devel/grpc142: Fix build with protobuf 22+ --- devel/grpc142/Makefile | 1 + devel/grpc142/files/patch-protobuf | 66 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/devel/grpc142/Makefile b/devel/grpc142/Makefile index d189618f6d09..b35e035b5647 100644 --- a/devel/grpc142/Makefile +++ b/devel/grpc142/Makefile @@ -33,6 +33,7 @@ CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package CMAKE_ON= BUILD_SHARED_LIBS +LDFLAGS+= -labsl_hash -labsl_raw_hash_set USE_LDCONFIG= yes PLIST_SUB= SHLIB_MAJOR=${PORTVERSION:R} \ diff --git a/devel/grpc142/files/patch-protobuf b/devel/grpc142/files/patch-protobuf new file mode 100644 index 000000000000..5367f513a01d --- /dev/null +++ b/devel/grpc142/files/patch-protobuf @@ -0,0 +1,66 @@ +--- CMakeLists.txt.orig 2021-11-16 23:39:48 UTC ++++ CMakeLists.txt +@@ -191,7 +191,7 @@ endif() + + # Add c++11 flags + if (NOT DEFINED CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 11) ++ set(CMAKE_CXX_STANDARD 17) + else() + if (CMAKE_CXX_STANDARD LESS 11) + message(FATAL_ERROR "CMAKE_CXX_STANDARD is less than 11, please specify at least SET(CMAKE_CXX_STANDARD 11)") +--- src/compiler/config_protobuf.h.orig 2021-11-16 23:39:48 UTC ++++ src/compiler/config_protobuf.h +@@ -50,7 +50,7 @@ + #endif + + #ifndef GRPC_CUSTOM_CSHARP_GETCLASSNAME +-#include ++#include + #define GRPC_CUSTOM_CSHARP_GETCLASSNAME \ + ::google::protobuf::compiler::csharp::GetClassName + #define GRPC_CUSTOM_CSHARP_GETFILENAMESPACE \ +--- src/compiler/objective_c_generator.cc.orig 2021-11-16 23:39:48 UTC ++++ src/compiler/objective_c_generator.cc +@@ -22,7 +22,7 @@ + #include + #include + +-#include ++#include + + #include "src/compiler/config.h" + #include "src/compiler/objective_c_generator_helpers.h" +--- src/compiler/objective_c_generator_helpers.h.orig 2021-11-16 23:39:48 UTC ++++ src/compiler/objective_c_generator_helpers.h +@@ -21,7 +21,7 @@ + + #include + +-#include ++#include + + #include "src/compiler/config.h" + #include "src/compiler/generator_helpers.h" +--- src/compiler/objective_c_plugin.cc.orig 2021-11-16 23:39:48 UTC ++++ src/compiler/objective_c_plugin.cc +@@ -20,7 +20,7 @@ + + #include + +-#include ++#include + + #include "src/compiler/config.h" + #include "src/compiler/objective_c_generator.h" +--- include/grpcpp/impl/codegen/config_protobuf.h.orig 2021-11-16 23:39:48 UTC ++++ include/grpcpp/impl/codegen/config_protobuf.h +@@ -69,7 +69,7 @@ + #include + #include + #define GRPC_CUSTOM_JSONUTIL ::google::protobuf::util +-#define GRPC_CUSTOM_UTIL_STATUS ::google::protobuf::util::Status ++#define GRPC_CUSTOM_UTIL_STATUS ::absl::Status + #endif + + namespace grpc {