CVS commit: pkgsrc/net/grpc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/grpc
From: "Min Sik Kim" <minskim%netbsd.org@localhost>
Date: Fri, 27 Apr 2018 17:47:27 +0000

Module Name:    pkgsrc
Committed By:   minskim
Date:           Fri Apr 27 17:47:27 UTC 2018

Modified Files:
        pkgsrc/net/grpc: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/net/grpc/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/net/grpc/patches: patch-cmake_benchmark.cmake
            patch-cmake_cares.cmake patch-src_core_lib_gpr_arena.cc

Log Message:
net/grpc: Update to 1.11.0

Notable changes since 1.7.2:
- Requires protobuf>=3.5.0
- Exec_ctx has been made a thread_local, and is no longer to be passed
  as a function parameter.
- LB policies request re-resolution without shutting down
- On server, include receiving HTTP/2 settings in handshake timeout
- C++ headers are moved from include/grpc++ to include/grpcpp. Headers
  in include/grpc++ are deprecated
- Experimental gRPC-C++ Cocoapods podspec
- Several features of core have been removed from the surface or GPR
  API: grpc_alarm, gpr_join_host_port, gpr_cmdline, gpr_subprocess,
  gpr_tls, gpr_avl, and gpr_thd
- Add core underpinnings for TLS session ticket support
- Experimental support for configurable retries


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/grpc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/grpc/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/grpc/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/grpc/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/grpc/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 pkgsrc/net/grpc/patches/patch-cmake_benchmark.cmake \
    pkgsrc/net/grpc/patches/patch-cmake_cares.cmake \
    pkgsrc/net/grpc/patches/patch-src_core_lib_gpr_arena.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/grpc/Makefile
diff -u pkgsrc/net/grpc/Makefile:1.4 pkgsrc/net/grpc/Makefile:1.5
--- pkgsrc/net/grpc/Makefile:1.4        Wed Jan 17 12:10:38 2018
+++ pkgsrc/net/grpc/Makefile    Fri Apr 27 17:47:27 2018
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2018/01/17 12:10:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2018/04/27 17:47:27 minskim Exp $
 
-DISTNAME=      grpc-1.7.2
-PKGREVISION=   1
+DISTNAME=      grpc-1.11.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grpc/}
-GITHUB_PROJECT=        grpc
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    minskim%NetBSD.org@localhost
@@ -13,8 +11,10 @@ COMMENT=     High performance, open-source u
 LICENSE=       apache-2.0
 
 USE_CMAKE=     yes
-USE_LANGUAGES+=        c c++
+USE_LANGUAGES+=        c c++11
+USE_TOOLS+=    pkg-config
 
+CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=on
 CMAKE_ARGS+=   -DgRPC_BENCHMARK_PROVIDER=package
 CMAKE_ARGS+=   -DgRPC_CARES_PROVIDER=package
 CMAKE_ARGS+=   -DgRPC_GFLAGS_PROVIDER=package
@@ -30,7 +30,7 @@ SUBST_SED.fix-include=                -e 's, /usr/loca
 
 .include "../../benchmarks/google-benchmark/buildlink3.mk"
 .include "../../devel/gflags/buildlink3.mk"
-BUILDLINK_API_DEPENDS.protobuf+=       protobuf>=3.4
+BUILDLINK_API_DEPENDS.protobuf+=       protobuf>=3.5
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/libcares/buildlink3.mk"

Index: pkgsrc/net/grpc/PLIST
diff -u pkgsrc/net/grpc/PLIST:1.2 pkgsrc/net/grpc/PLIST:1.3
--- pkgsrc/net/grpc/PLIST:1.2   Fri Oct 27 16:45:34 2017
+++ pkgsrc/net/grpc/PLIST       Fri Apr 27 17:47:27 2018
@@ -1,18 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2017/10/27 16:45:34 minskim Exp $
-bin/check_epollexclusive
-bin/gen_hpack_tables
-bin/gen_legal_metadata_characters
-bin/gen_percent_encoding_tables
+@comment $NetBSD: PLIST,v 1.3 2018/04/27 17:47:27 minskim Exp $
 bin/grpc_cpp_plugin
-bin/grpc_create_jwt
 bin/grpc_csharp_plugin
 bin/grpc_node_plugin
 bin/grpc_objective_c_plugin
 bin/grpc_php_plugin
-bin/grpc_print_google_default_creds_token
 bin/grpc_python_plugin
 bin/grpc_ruby_plugin
-bin/grpc_verify_jwt
 include/grpc++/alarm.h
 include/grpc++/channel.h
 include/grpc++/client_context.h
@@ -110,7 +103,6 @@ include/grpc/impl/codegen/byte_buffer.h
 include/grpc/impl/codegen/byte_buffer_reader.h
 include/grpc/impl/codegen/compression_types.h
 include/grpc/impl/codegen/connectivity_state.h
-include/grpc/impl/codegen/exec_ctx_fwd.h
 include/grpc/impl/codegen/fork.h
 include/grpc/impl/codegen/gpr_slice.h
 include/grpc/impl/codegen/gpr_types.h
@@ -133,41 +125,135 @@ include/grpc/support/atm.h
 include/grpc/support/atm_gcc_atomic.h
 include/grpc/support/atm_gcc_sync.h
 include/grpc/support/atm_windows.h
-include/grpc/support/avl.h
-include/grpc/support/cmdline.h
 include/grpc/support/cpu.h
-include/grpc/support/histogram.h
-include/grpc/support/host_port.h
 include/grpc/support/log.h
 include/grpc/support/log_windows.h
 include/grpc/support/port_platform.h
 include/grpc/support/string_util.h
-include/grpc/support/subprocess.h
 include/grpc/support/sync.h
 include/grpc/support/sync_custom.h
 include/grpc/support/sync_generic.h
 include/grpc/support/sync_posix.h
 include/grpc/support/sync_windows.h
-include/grpc/support/thd.h
+include/grpc/support/thd_id.h
 include/grpc/support/time.h
-include/grpc/support/tls.h
-include/grpc/support/tls_gcc.h
-include/grpc/support/tls_msvc.h
-include/grpc/support/tls_pthread.h
-include/grpc/support/useful.h
 include/grpc/support/workaround_list.h
+include/grpcpp/alarm.h
+include/grpcpp/channel.h
+include/grpcpp/client_context.h
+include/grpcpp/completion_queue.h
+include/grpcpp/create_channel.h
+include/grpcpp/create_channel_posix.h
+include/grpcpp/ext/health_check_service_server_builder_option.h
+include/grpcpp/ext/proto_server_reflection_plugin.h
+include/grpcpp/generic/async_generic_service.h
+include/grpcpp/generic/generic_stub.h
+include/grpcpp/grpcpp.h
+include/grpcpp/health_check_service_interface.h
+include/grpcpp/impl/call.h
+include/grpcpp/impl/channel_argument_option.h
+include/grpcpp/impl/client_unary_call.h
+include/grpcpp/impl/codegen/async_stream.h
+include/grpcpp/impl/codegen/async_unary_call.h
+include/grpcpp/impl/codegen/byte_buffer.h
+include/grpcpp/impl/codegen/call.h
+include/grpcpp/impl/codegen/call_hook.h
+include/grpcpp/impl/codegen/channel_interface.h
+include/grpcpp/impl/codegen/client_context.h
+include/grpcpp/impl/codegen/client_unary_call.h
+include/grpcpp/impl/codegen/completion_queue.h
+include/grpcpp/impl/codegen/completion_queue_tag.h
+include/grpcpp/impl/codegen/config.h
+include/grpcpp/impl/codegen/config_protobuf.h
+include/grpcpp/impl/codegen/core_codegen.h
+include/grpcpp/impl/codegen/core_codegen_interface.h
+include/grpcpp/impl/codegen/create_auth_context.h
+include/grpcpp/impl/codegen/grpc_library.h
+include/grpcpp/impl/codegen/metadata_map.h
+include/grpcpp/impl/codegen/method_handler_impl.h
+include/grpcpp/impl/codegen/proto_utils.h
+include/grpcpp/impl/codegen/rpc_method.h
+include/grpcpp/impl/codegen/rpc_service_method.h
+include/grpcpp/impl/codegen/security/auth_context.h
+include/grpcpp/impl/codegen/serialization_traits.h
+include/grpcpp/impl/codegen/server_context.h
+include/grpcpp/impl/codegen/server_interface.h
+include/grpcpp/impl/codegen/service_type.h
+include/grpcpp/impl/codegen/slice.h
+include/grpcpp/impl/codegen/status.h
+include/grpcpp/impl/codegen/status_code_enum.h
+include/grpcpp/impl/codegen/string_ref.h
+include/grpcpp/impl/codegen/stub_options.h
+include/grpcpp/impl/codegen/sync_stream.h
+include/grpcpp/impl/codegen/time.h
+include/grpcpp/impl/grpc_library.h
+include/grpcpp/impl/method_handler_impl.h
+include/grpcpp/impl/rpc_method.h
+include/grpcpp/impl/rpc_service_method.h
+include/grpcpp/impl/serialization_traits.h
+include/grpcpp/impl/server_builder_option.h
+include/grpcpp/impl/server_builder_plugin.h
+include/grpcpp/impl/server_initializer.h
+include/grpcpp/impl/service_type.h
+include/grpcpp/resource_quota.h
+include/grpcpp/security/auth_context.h
+include/grpcpp/security/auth_metadata_processor.h
+include/grpcpp/security/credentials.h
+include/grpcpp/security/server_credentials.h
+include/grpcpp/server.h
+include/grpcpp/server_builder.h
+include/grpcpp/server_context.h
+include/grpcpp/server_posix.h
+include/grpcpp/support/async_stream.h
+include/grpcpp/support/async_unary_call.h
+include/grpcpp/support/byte_buffer.h
+include/grpcpp/support/channel_arguments.h
+include/grpcpp/support/config.h
+include/grpcpp/support/error_details.h
+include/grpcpp/support/slice.h
+include/grpcpp/support/status.h
+include/grpcpp/support/status_code_enum.h
+include/grpcpp/support/string_ref.h
+include/grpcpp/support/stub_options.h
+include/grpcpp/support/sync_stream.h
+include/grpcpp/support/time.h
 lib/cmake/grpc/gRPCConfig.cmake
 lib/cmake/grpc/gRPCConfigVersion.cmake
 lib/cmake/grpc/gRPCTargets-noconfig.cmake
 lib/cmake/grpc/gRPCTargets.cmake
-lib/libgpr.a
-lib/libgrpc++.a
-lib/libgrpc++_cronet.a
-lib/libgrpc++_error_details.a
-lib/libgrpc++_reflection.a
-lib/libgrpc++_unsecure.a
-lib/libgrpc.a
-lib/libgrpc_cronet.a
+lib/libaddress_sorting.so.${PKGVERSION}
+lib/libaddress_sorting.so.1
+lib/libaddress_sorting.so
+lib/libgpr.so.${PKGVERSION}
+lib/libgpr.so.1
+lib/libgpr.so
+lib/libgrpc++.so.${PKGVERSION}
+lib/libgrpc++.so.1
+lib/libgrpc++.so
+lib/libgrpc++_cronet.so.${PKGVERSION}
+lib/libgrpc++_cronet.so.1
+lib/libgrpc++_cronet.so
+lib/libgrpc++_error_details.so.${PKGVERSION}
+lib/libgrpc++_error_details.so.1
+lib/libgrpc++_error_details.so
+lib/libgrpc++_reflection.so.${PKGVERSION}
+lib/libgrpc++_reflection.so.1
+lib/libgrpc++_reflection.so
+lib/libgrpc++_unsecure.so.${PKGVERSION}
+lib/libgrpc++_unsecure.so.1
+lib/libgrpc++_unsecure.so
+lib/libgrpc.so.${PKGVERSION}
+lib/libgrpc.so.1
+lib/libgrpc.so
+lib/libgrpc_cronet.so.${PKGVERSION}
+lib/libgrpc_cronet.so.1
+lib/libgrpc_cronet.so
+lib/libgrpc_csharp_ext.so.${PKGVERSION}
+lib/libgrpc_csharp_ext.so.1
 lib/libgrpc_csharp_ext.so
-lib/libgrpc_plugin_support.a
-lib/libgrpc_unsecure.a
+lib/libgrpc_plugin_support.so.2.0.0
+lib/libgrpc_plugin_support.so.2
+lib/libgrpc_plugin_support.so
+lib/libgrpc_unsecure.so.${PKGVERSION}
+lib/libgrpc_unsecure.so.1
+lib/libgrpc_unsecure.so

Index: pkgsrc/net/grpc/buildlink3.mk
diff -u pkgsrc/net/grpc/buildlink3.mk:1.1 pkgsrc/net/grpc/buildlink3.mk:1.2
--- pkgsrc/net/grpc/buildlink3.mk:1.1   Mon Oct 23 15:48:04 2017
+++ pkgsrc/net/grpc/buildlink3.mk       Fri Apr 27 17:47:27 2018
@@ -1,13 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/10/23 15:48:04 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/04/27 17:47:27 minskim Exp $
 
 BUILDLINK_TREE+=       grpc
 
 .if !defined(GRPC_BUILDLINK3_MK)
 GRPC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.grpc+=   grpc>=1.6.7
+BUILDLINK_API_DEPENDS.grpc+=   grpc>=1.11.0
 BUILDLINK_PKGSRCDIR.grpc?=     ../../net/grpc
 
+.include "../../devel/protobuf/buildlink3.mk"
 .endif # GRPC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -grpc

Index: pkgsrc/net/grpc/distinfo
diff -u pkgsrc/net/grpc/distinfo:1.3 pkgsrc/net/grpc/distinfo:1.4
--- pkgsrc/net/grpc/distinfo:1.3        Mon Dec  4 18:20:30 2017
+++ pkgsrc/net/grpc/distinfo    Fri Apr 27 17:47:27 2018
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.3 2017/12/04 18:20:30 minskim Exp $
+$NetBSD: distinfo,v 1.4 2018/04/27 17:47:27 minskim Exp $
 
-SHA1 (grpc-1.7.2.tar.gz) = 697639b3e46e084eb2a23ec1a277f53444e144cd
-RMD160 (grpc-1.7.2.tar.gz) = 5e64429298e0189b637b0599a86e8596d08192b9
-SHA512 (grpc-1.7.2.tar.gz) = 54cb4165878fb3361cd7a81b631f1b20e991eadd286c0f6020542a8aa464cf30bdd1479dc413b767a1585bdc730e465a64c45e9e805723f38bd54521e1c4f942
-Size (grpc-1.7.2.tar.gz) = 4724465 bytes
-SHA1 (patch-CMakeLists.txt) = cad9e05c7c93e684456506cb5f8a195fdc7b8efc
+SHA1 (grpc-1.11.0.tar.gz) = e4ddeb1de8ccc00987a8a12879d0ecbfe9ccb5d6
+RMD160 (grpc-1.11.0.tar.gz) = 9d950dee2d00015f72066dd9b83c92b0a4bb81cb
+SHA512 (grpc-1.11.0.tar.gz) = 3127cf0e66cd0712d905e6008adf6f80d787ad97eae2fba38fa3f4d343849a3dc3ca8f2ccbc82020e812fdb272e9577584c298a5b623fbdcac40c1efd7877855
+Size (grpc-1.11.0.tar.gz) = 13431990 bytes
+SHA1 (patch-CMakeLists.txt) = 3bd2e5bc254a06b03578430eb57ea14c13336219
+SHA1 (patch-cmake_benchmark.cmake) = 031873ba9a8cd93d491693feb4d58e52a715cc64
+SHA1 (patch-cmake_cares.cmake) = 19324318dce81451bf7a53d0ca5a7e445a751db5
+SHA1 (patch-src_core_lib_gpr_arena.cc) = 57fdb3de54ce8548fa9b50ea360530c35c3e616c

Index: pkgsrc/net/grpc/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.2 pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/net/grpc/patches/patch-CMakeLists.txt:1.2    Fri Oct 27 16:45:34 2017
+++ pkgsrc/net/grpc/patches/patch-CMakeLists.txt        Fri Apr 27 17:47:27 2018
@@ -1,27 +1,111 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2017/10/27 16:45:34 minskim Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2018/04/27 17:47:27 minskim Exp $
 
-Make this build with pkgsrc google-benchmark and libcares.
+Add version number to shared libraries.
 
---- CMakeLists.txt.orig        2017-10-26 19:11:22.000000000 +0000
+--- CMakeLists.txt.orig        2018-04-13 18:08:11.000000000 +0000
 +++ CMakeLists.txt
-@@ -144,9 +144,11 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
-     set(gRPC_INSTALL FALSE)
-   endif()
- elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package")
--  find_package(c-ares REQUIRED CONFIG)
-+  find_library(cares REQUIRED)
-   if(TARGET c-ares::cares)
-     set(_gRPC_CARES_LIBRARIES c-ares::cares)
-+  else()
-+    set(_gRPC_CARES_LIBRARIES cares)
-   endif()
-   set(_gRPC_FIND_CARES "if(NOT c-ares_FOUND)\n  find_package(c-ares CONFIG)\nendif()")
- endif()
-@@ -271,7 +273,6 @@ if("${gRPC_BENCHMARK_PROVIDER}" STREQUAL
-       message(WARNING "gRPC_BENCHMARK_PROVIDER is \"module\" but BENCHMARK_ROOT_DIR is wrong")
-   endif()
- elseif("${gRPC_BENCHMARK_PROVIDER}" STREQUAL "package")
--  find_package(benchmark)
-   if(TARGET benchmark::benchmark)
-     set(_gRPC_BENCHMARK_LIBRARIES benchmark::benchmark)
-   endif()
+@@ -171,7 +171,7 @@ function(protobuf_generate_grpc_cpp)
+              "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h"
+              "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc"
+              "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h"
+-      COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}
++      COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR} ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}
+       ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}
+            --cpp_out=${_gRPC_PROTO_GENS_DIR}
+            --plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin>
+@@ -664,6 +664,7 @@ add_library(address_sorting
+   third_party/address_sorting/address_sorting_posix.c
+   third_party/address_sorting/address_sorting_windows.c
+ )
++set_target_properties(address_sorting PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting"
+@@ -784,6 +785,7 @@ add_library(gpr
+   src/core/lib/profiling/basic_timers.cc
+   src/core/lib/profiling/stap_timers.cc
+ )
++set_target_properties(gpr PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr"
+@@ -1211,6 +1213,7 @@ add_library(grpc
+   src/core/ext/filters/workarounds/workaround_utils.cc
+   src/core/plugin_registry/grpc_plugin_registry.cc
+ )
++set_target_properties(grpc PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc"
+@@ -1581,6 +1584,7 @@ add_library(grpc_cronet
+   src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc
+   src/core/plugin_registry/grpc_cronet_plugin_registry.cc
+ )
++set_target_properties(grpc_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet"
+@@ -2509,6 +2513,7 @@ add_library(grpc_unsecure
+   src/core/ext/filters/workarounds/workaround_utils.cc
+   src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
+ )
++set_target_properties(grpc_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure"
+@@ -2722,6 +2727,7 @@ add_library(grpc++
+   src/cpp/util/time_cc.cc
+   src/cpp/codegen/codegen_init.cc
+ )
++set_target_properties(grpc++ PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++"
+@@ -3282,6 +3288,7 @@ add_library(grpc++_cronet
+   third_party/nanopb/pb_decode.c
+   third_party/nanopb/pb_encode.c
+ )
++set_target_properties(grpc++_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet"
+@@ -3546,6 +3553,7 @@ add_library(grpc++_error_details
+   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h
+   src/cpp/util/error_details.cc
+ )
++set_target_properties(grpc++_error_details PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details"
+@@ -3676,6 +3684,7 @@ add_library(grpc++_reflection
+   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.h
+   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h
+ )
++set_target_properties(grpc++_reflection PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
+@@ -4172,6 +4181,7 @@ add_library(grpc++_unsecure
+   src/cpp/util/time_cc.cc
+   src/cpp/codegen/codegen_init.cc
+ )
++set_target_properties(grpc++_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure"
+@@ -4549,6 +4559,7 @@ add_library(grpc_plugin_support
+   src/compiler/python_generator.cc
+   src/compiler/ruby_generator.cc
+ )
++set_target_properties(grpc_plugin_support PROPERTIES VERSION 2.0.0 SOVERSION 2)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support"
+@@ -5061,6 +5072,7 @@ endif (gRPC_BUILD_TESTS)
+ add_library(grpc_csharp_ext SHARED
+   src/csharp/ext/grpc_csharp_ext.c
+ )
++set_target_properties(grpc_csharp_ext PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
+ 
+ if(WIN32 AND MSVC)
+   set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext"

Added files:

Index: pkgsrc/net/grpc/patches/patch-cmake_benchmark.cmake
diff -u /dev/null pkgsrc/net/grpc/patches/patch-cmake_benchmark.cmake:1.1
--- /dev/null   Fri Apr 27 17:47:27 2018
+++ pkgsrc/net/grpc/patches/patch-cmake_benchmark.cmake Fri Apr 27 17:47:27 2018
@@ -0,0 +1,21 @@
+$NetBSD: patch-cmake_benchmark.cmake,v 1.1 2018/04/27 17:47:27 minskim Exp $
+
+Find benchmark from pkgsrc.
+
+--- cmake/benchmark.cmake.orig 2018-04-13 18:08:11.000000000 +0000
++++ cmake/benchmark.cmake
+@@ -26,8 +26,12 @@ if("${gRPC_BENCHMARK_PROVIDER}" STREQUAL
+       message(WARNING "gRPC_BENCHMARK_PROVIDER is \"module\" but BENCHMARK_ROOT_DIR is wrong")
+   endif()
+ elseif("${gRPC_BENCHMARK_PROVIDER}" STREQUAL "package")
+-  # Use "CONFIG" as there is no built-in cmake module for benchmark.
+-  find_package(benchmark REQUIRED CONFIG)
++  find_path(BENCHMARK_INCLUDE_DIR benchmark/benchmark.h)
++  find_library(BENCHMARK_LIB benchmark)
++  add_library(benchmark::benchmark UNKNOWN IMPORTED)
++  set_target_properties(benchmark::benchmark PROPERTIES
++    INTERFACE_INCLUDE_DIRECTORIES "${BENCHMARK_INCLUDE_DIR}"
++    IMPORTED_LOCATION "${BENCHMARK_LIB}")
+   if(TARGET benchmark::benchmark)
+     set(_gRPC_BENCHMARK_LIBRARIES benchmark::benchmark)
+     # extract the include dir from target's properties
Index: pkgsrc/net/grpc/patches/patch-cmake_cares.cmake
diff -u /dev/null pkgsrc/net/grpc/patches/patch-cmake_cares.cmake:1.1
--- /dev/null   Fri Apr 27 17:47:27 2018
+++ pkgsrc/net/grpc/patches/patch-cmake_cares.cmake     Fri Apr 27 17:47:27 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-cmake_cares.cmake,v 1.1 2018/04/27 17:47:27 minskim Exp $
+
+Find libcares from pkgsrc.
+
+--- cmake/cares.cmake.orig     2018-04-13 18:08:11.000000000 +0000
++++ cmake/cares.cmake
+@@ -31,10 +31,11 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
+   endif()
+ elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package")
+   # Use "CONFIG" as there is no built-in cmake module for c-ares.
+-  find_package(c-ares REQUIRED CONFIG)
+-  if(TARGET c-ares::cares)
+-    set(_gRPC_CARES_LIBRARIES c-ares::cares)
+-    set(_gRPC_CARES_INCLUDE_DIR ${c-ares_INCLUDE_DIR})
++  find_package(PkgConfig REQUIRED)
++  pkg_search_module(cares REQUIRED IMPORTED_TARGET libcares)
++  if(TARGET PkgConfig::cares)
++    set(_gRPC_CARES_LIBRARIES PkgConfig::cares)
++    set(_gRPC_CARES_INCLUDE_DIR ${cares_INCLUDE_DIRS})
+   endif()
+   set(_gRPC_FIND_CARES "if(NOT c-ares_FOUND)\n  find_package(c-ares CONFIG)\nendif()")
+ endif()
Index: pkgsrc/net/grpc/patches/patch-src_core_lib_gpr_arena.cc
diff -u /dev/null pkgsrc/net/grpc/patches/patch-src_core_lib_gpr_arena.cc:1.1
--- /dev/null   Fri Apr 27 17:47:27 2018
+++ pkgsrc/net/grpc/patches/patch-src_core_lib_gpr_arena.cc     Fri Apr 27 17:47:27 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_lib_gpr_arena.cc,v 1.1 2018/04/27 17:47:27 minskim Exp $
+
+Fix build on FreeBSD (https://github.com/grpc/grpc/issues/15010).
+
+--- src/core/lib/gpr/arena.cc.orig     2018-04-13 18:08:11.000000000 +0000
++++ src/core/lib/gpr/arena.cc
+@@ -128,7 +128,7 @@ void* gpr_arena_alloc(gpr_arena* arena, 
+           ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(zone)) + next_z_size));
+       next_z->size_begin = z->size_end;
+       next_z->size_end = z->size_end + next_z_size;
+-      if (!gpr_atm_rel_cas(&z->next_atm, static_cast<gpr_atm>(NULL),
++      if (!gpr_atm_rel_cas(&z->next_atm, (gpr_atm)NULL,
+                            (gpr_atm)next_z)) {
+         gpr_free_aligned(next_z);
+         next_z = (zone*)gpr_atm_acq_load(&z->next_atm);

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index