diff options
Diffstat (limited to 'devel/grpc')
-rw-r--r-- | devel/grpc/Makefile | 9 | ||||
-rw-r--r-- | devel/grpc/files/extra-patch-openssl | 20 |
2 files changed, 1 insertions, 28 deletions
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index f12b633cf6e4..539280461f87 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -53,13 +53,6 @@ PLIST_SUB= SHLIB_MAJOR=${PORTVERSION:R} \ CONFLICTS_INSTALL= grpc[0-9][0-9][0-9] -.include <bsd.port.pre.mk> - -# Skip openssl.pc while using OpenSSL from base system on older FreeBSD versions which does not skip this file -.if ${SSL_DEFAULT} == base && !exists(/usr/libdata/pkgconfig/openssl.pc) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl -.endif - post-patch: # Clean up bundled libraries @${RM} -r ${WRKSRC}/third_party/abseil-cpp/ @@ -73,4 +66,4 @@ post-patch: @${RM} -r ${WRKSRC}/third_party/xxhash/ @${RM} -r ${WRKSRC}/third_party/zlib/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/grpc/files/extra-patch-openssl b/devel/grpc/files/extra-patch-openssl deleted file mode 100644 index 2f950a6d85f0..000000000000 --- a/devel/grpc/files/extra-patch-openssl +++ /dev/null @@ -1,20 +0,0 @@ ---- CMakeLists.txt.orig 2023-11-28 00:12:30 UTC -+++ CMakeLists.txt -@@ -30395,7 +30395,7 @@ generate_pkgconfig( - "high performance general RPC framework" - "${gRPC_CORE_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" -- "libcares openssl re2 zlib" -+ "libcares re2 zlib" - "-lgrpc" - "-laddress_sorting -lupb -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_collections_lib" - "grpc.pc") -@@ -30417,7 +30417,7 @@ generate_pkgconfig( - "C++ wrapper for gRPC" - "${gRPC_CPP_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc" -- "libcares openssl re2 zlib" -+ "libcares re2 zlib" - "-lgrpc++" - "-laddress_sorting -lupb -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_collections_lib" - "grpc++.pc") |