Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Nov 2021 00:46:07 GMT
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9c8c782d6aaa - main - devel/grpc130: unbreak patching with ${SSL_DEFAULT} == base (+)
Message-ID:  <202111200046.1AK0k7Cq050642@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9c8c782d6aaa78b6e9e8d04b838e914fcf7a8b10

commit 9c8c782d6aaa78b6e9e8d04b838e914fcf7a8b10
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2021-11-20 00:42:02 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
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")



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111200046.1AK0k7Cq050642>