From nobody Sat Nov 20 00:46:07 2021 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 DB36A1893A27; Sat, 20 Nov 2021 00:46:07 +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 4Hwvwb5vcYz3nsH; Sat, 20 Nov 2021 00:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A77361273E; Sat, 20 Nov 2021 00:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AK0k78k050643; Sat, 20 Nov 2021 00:46:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AK0k7Cq050642; Sat, 20 Nov 2021 00:46:07 GMT (envelope-from git) Date: Sat, 20 Nov 2021 00:46:07 GMT Message-Id: <202111200046.1AK0k7Cq050642@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 9c8c782d6aaa - main - devel/grpc130: unbreak patching with ${SSL_DEFAULT} == base (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c8c782d6aaa78b6e9e8d04b838e914fcf7a8b10 Auto-Submitted: auto-generated X-Spam: Yes X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c8c782d6aaa78b6e9e8d04b838e914fcf7a8b10 commit 9c8c782d6aaa78b6e9e8d04b838e914fcf7a8b10 Author: Dima Panov AuthorDate: 2021-11-20 00:42:02 +0000 Commit: Dima Panov CommitDate: 2021-11-20 00:42:02 +0000 devel/grpc130: unbreak patching with ${SSL_DEFAULT} == base (+) This is follow-up to commit 0aac4480b2555d806f449b77e755cf7cfd616707 Pointyhat to: mfechner Approved by: portmgr blanket (trivial fix build) Sponsored by: Netzkommune GmbH --- devel/grpc130/files/extra-patch-CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/grpc130/files/extra-patch-CMakeLists.txt b/devel/grpc130/files/extra-patch-CMakeLists.txt index 794b40b630cb..977f23fc28f4 100644 --- a/devel/grpc130/files/extra-patch-CMakeLists.txt +++ b/devel/grpc130/files/extra-patch-CMakeLists.txt @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2021-09-25 02:33:41 UTC +--- CMakeLists.txt.orig 2020-07-17 07:26:25 UTC +++ CMakeLists.txt -@@ -17664,7 +17664,7 @@ generate_pkgconfig( +@@ -15129,7 +15129,7 @@ generate_pkgconfig( "gRPC" "high performance general RPC framework" "${gRPC_CORE_VERSION}" -- "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant" -+ "gpr absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant" - "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" +- "gpr openssl" ++ "gpr" + "-lgrpc -laddress_sorting -lupb -lcares -lz -labsl_bad_optional_access -labsl_str_format_internal -labsl_time -labsl_time_zone -labsl_civil_time -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_int128 -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity -labsl_dynamic_annotations" "" "grpc.pc")