svn commit: r439926 - in head/devel/grpc: . files
Vanilla I. Shu
vanilla at FreeBSD.org
Tue May 2 04:18:55 UTC 2017
Author: vanilla
Date: Tue May 2 04:18:53 2017
New Revision: 439926
URL: https://svnweb.freebsd.org/changeset/ports/439926
Log:
Update to 1.3.0.
Added:
head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c (contents, props changed)
head/devel/grpc/files/patch-third__party_benchmark_CMakeLists.txt (contents, props changed)
head/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt (contents, props changed)
Deleted:
head/devel/grpc/files/patch-src_core_lib_tsi_ssl__transport__security.c
Modified:
head/devel/grpc/Makefile
head/devel/grpc/distinfo
head/devel/grpc/files/patch-CMakeLists.txt
head/devel/grpc/pkg-plist
Modified: head/devel/grpc/Makefile
==============================================================================
--- head/devel/grpc/Makefile Tue May 2 03:43:15 2017 (r439925)
+++ head/devel/grpc/Makefile Tue May 2 04:18:53 2017 (r439926)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= grpc
-PORTVERSION= 1.2.5
+PORTVERSION= 1.3.0
DISTVERSIONPREFIX= v
CATEGORIES= devel
@@ -12,21 +12,28 @@ COMMENT= HTTP/2-based RPC framework
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
+BUILD_DEPENDS= go:lang/go
LIB_DEPENDS= libgflags.so:devel/gflags \
- libprotobuf.so:devel/protobuf
+ libprotobuf.so:devel/protobuf \
+ libcares.so:dns/c-ares
USE_GITHUB= yes
-GH_ACCOUNT= grpc
+GH_TUPLE= grpc:grpc:v${PORTVERSION} \
+ boringssl:boringssl:ebcb5be:boringssl/third_party/boringssl \
+ google:benchmark:v1.1.0:benchmark/third_party/benchmark
-USES= cmake ssl
+USES= cmake perl5 pkgconfig
USE_LDCONFIG= yes
-CXXFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lpthread -lm
+USE_PERL5= build
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lpthread -lcares -lm
CMAKE_ARGS= -DgRPC_ZLIB_PROVIDER:STRING="package" \
-DgRPC_PROTOBUF_PROVIDER:STRING="package" \
-DgRPC_GFLAGS_PROVIDER:STRING="package" \
- -DgRPC_SSL_PROVIDER:STRING="package" \
- -DBUILD_SHARED_LIBS=ON \
- -DBUILD_STATIC_LIBS=ON
+ -DgRPC_SSL_PROVIDER:STRING="module" \
+ -DgRPC_CARES_PROVIDER:STRING="package" \
+ -DgRPC_BENCHMARK_PROVIDER:STRING="module" \
+ -DBENCHMARK_USE_LIBCXX=ON \
+ -DBUILD_SHARED_LIBS=ON
.include <bsd.port.mk>
Modified: head/devel/grpc/distinfo
==============================================================================
--- head/devel/grpc/distinfo Tue May 2 03:43:15 2017 (r439925)
+++ head/devel/grpc/distinfo Tue May 2 04:18:53 2017 (r439926)
@@ -1,3 +1,7 @@
-TIMESTAMP = 1493132054
-SHA256 (grpc-grpc-v1.2.5_GH0.tar.gz) = 44b60a7d2d6108ee569f970373401b57486146bc980bf4dd8187ed052e95cb83
-SIZE (grpc-grpc-v1.2.5_GH0.tar.gz) = 4450406
+TIMESTAMP = 1493559584
+SHA256 (grpc-grpc-v1.3.0_GH0.tar.gz) = 14448d4faf0f36a4494fce476f8f2d51f31523dda2cb88221a5fa80620d48c06
+SIZE (grpc-grpc-v1.3.0_GH0.tar.gz) = 4695096
+SHA256 (boringssl-boringssl-ebcb5be_GH0.tar.gz) = 324b80025f73eba48791fdfcf82e81b4496b8a002fd985d68cca137f31d25e4c
+SIZE (boringssl-boringssl-ebcb5be_GH0.tar.gz) = 5936046
+SHA256 (google-benchmark-v1.1.0_GH0.tar.gz) = e7334dd254434c6668e33a54c8f839194c7c61840d52f4b6258eee28e9f3b20e
+SIZE (google-benchmark-v1.1.0_GH0.tar.gz) = 87199
Modified: head/devel/grpc/files/patch-CMakeLists.txt
==============================================================================
--- head/devel/grpc/files/patch-CMakeLists.txt Tue May 2 03:43:15 2017 (r439925)
+++ head/devel/grpc/files/patch-CMakeLists.txt Tue May 2 04:18:53 2017 (r439926)
@@ -1,6 +1,16 @@
---- CMakeLists.txt.orig 2017-03-20 21:16:13 UTC
+--- CMakeLists.txt.orig 2017-04-27 20:59:19 UTC
+++ CMakeLists.txt
-@@ -145,24 +145,14 @@ if("${gRPC_PROTOBUF_PROVIDER}" STREQUAL
+@@ -150,7 +150,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
+ message(WARNING "gRPC_CARES_PROVIDER is \"module\" but CARES_ROOT_DIR is wrong")
+ endif()
+ elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package")
+- find_package(CARES)
++ find_package(PkgConfig REQUIRED)
++ pkg_search_module(CARES REQUIRED libcares)
+ if(TARGET CARES::CARES)
+ set(_gRPC_CARES_LIBRARIES CARES::CARES)
+ endif()
+@@ -177,24 +178,14 @@ if("${gRPC_PROTOBUF_PROVIDER}" STREQUAL
if(TARGET libprotoc)
set(_gRPC_PROTOBUF_PROTOC_LIBRARIES libprotoc)
endif()
@@ -29,7 +39,7 @@
set(_gRPC_FIND_PROTOBUF "if(NOT protobuf_FOUND)\n find_package(protobuf CONFIG)\nendif()")
else()
find_package(Protobuf MODULE)
-@@ -237,7 +227,7 @@ if(NOT MSVC)
+@@ -270,7 +261,7 @@ if(NOT MSVC)
endif()
if(UNIX)
@@ -38,7 +48,7 @@
endif()
if(WIN32 AND MSVC)
-@@ -283,7 +273,7 @@ function(protobuf_generate_grpc_cpp)
+@@ -316,7 +307,7 @@ function(protobuf_generate_grpc_cpp)
"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.h"
"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc"
"${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h"
@@ -47,7 +57,7 @@
ARGS --grpc_out=${_gRPC_PROTO_GENS_DIR}
--cpp_out=${_gRPC_PROTO_GENS_DIR}
--plugin=protoc-gen-grpc=$<TARGET_FILE:grpc_cpp_plugin>
-@@ -730,6 +720,7 @@ add_library(gpr
+@@ -780,6 +771,7 @@ add_library(gpr
src/core/lib/support/tmpfile_windows.c
src/core/lib/support/wrap_memcpy.c
)
@@ -55,47 +65,55 @@
if(WIN32 AND MSVC)
set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr"
-@@ -1078,6 +1069,7 @@ add_library(grpc
- src/core/ext/census/tracing.c
+@@ -1145,6 +1137,7 @@ add_library(grpc
+ src/core/ext/filters/max_age/max_age_filter.c
src/core/plugin_registry/grpc_plugin_registry.c
)
+set_target_properties(grpc PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1)
if(WIN32 AND MSVC)
set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc"
-@@ -1359,6 +1351,7 @@ add_library(grpc_cronet
- src/core/ext/load_reporting/load_reporting_filter.c
+@@ -1437,6 +1430,7 @@ add_library(grpc_cronet
+ src/core/ext/filters/load_reporting/load_reporting_filter.c
src/core/plugin_registry/grpc_cronet_plugin_registry.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"
-@@ -1903,6 +1896,7 @@ add_library(grpc_unsecure
- src/core/ext/census/tracing.c
+@@ -2011,6 +2005,7 @@ add_library(grpc_unsecure
+ src/core/ext/filters/max_age/max_age_filter.c
src/core/plugin_registry/grpc_unsecure_plugin_registry.c
)
+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"
-@@ -2104,6 +2098,7 @@ add_library(grpc++
- src/cpp/util/time_cc.cc
+@@ -2353,6 +2348,7 @@ add_library(grpc++
+ third_party/nanopb/pb_encode.c
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++"
-@@ -2473,6 +2468,7 @@ add_library(grpc++_cronet
- third_party/nanopb/pb_decode.c
- third_party/nanopb/pb_encode.c
+@@ -2746,6 +2742,7 @@ add_library(grpc++_cronet
+ src/core/ext/census/trace_context.c
+ src/core/ext/census/tracing.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"
-@@ -2694,6 +2690,7 @@ add_library(grpc++_reflection
+@@ -2915,6 +2912,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"
+@@ -3042,6 +3040,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
)
@@ -103,15 +121,23 @@
if(WIN32 AND MSVC)
set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
-@@ -2961,6 +2958,7 @@ add_library(grpc++_unsecure
- src/cpp/util/time_cc.cc
+@@ -3169,6 +3168,7 @@ add_library(grpc++_test_util
+ test/cpp/util/test_credentials_provider.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++_test_util PROPERTIES COMPILE_PDB_NAME "grpc++_test_util"
+@@ -3450,6 +3450,7 @@ add_library(grpc++_unsecure
+ third_party/nanopb/pb_encode.c
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"
-@@ -3220,6 +3218,7 @@ add_library(grpc_plugin_support
+@@ -3732,6 +3733,7 @@ add_library(grpc_plugin_support
src/compiler/python_generator.cc
src/compiler/ruby_generator.cc
)
@@ -119,7 +145,7 @@
if(WIN32 AND MSVC)
set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support"
-@@ -3697,6 +3696,7 @@ endif (gRPC_BUILD_TESTS)
+@@ -4241,6 +4243,7 @@ endif (gRPC_BUILD_TESTS)
add_library(grpc_csharp_ext SHARED
src/csharp/ext/grpc_csharp_ext.c
)
Added: head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c Tue May 2 04:18:53 2017 (r439926)
@@ -0,0 +1,10 @@
+--- src/core/tsi/ssl_transport_security.c.orig 2017-05-02 03:20:57 UTC
++++ src/core/tsi/ssl_transport_security.c
+@@ -35,6 +35,7 @@
+
+ #include <grpc/support/port_platform.h>
+
++#include <sys/socket.h>
+ #include <limits.h>
+ #include <string.h>
+
Added: head/devel/grpc/files/patch-third__party_benchmark_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/grpc/files/patch-third__party_benchmark_CMakeLists.txt Tue May 2 04:18:53 2017 (r439926)
@@ -0,0 +1,12 @@
+--- third_party/benchmark/CMakeLists.txt.orig 2016-10-28 21:22:22 UTC
++++ third_party/benchmark/CMakeLists.txt
+@@ -80,9 +80,6 @@ else()
+ add_cxx_compiler_flag(-Wshorten-64-to-32)
+ add_cxx_compiler_flag(-Wfloat-equal)
+ add_cxx_compiler_flag(-fstrict-aliasing)
+- if (NOT BENCHMARK_USE_LIBCXX)
+- add_cxx_compiler_flag(-Wzero-as-null-pointer-constant)
+- endif()
+ if (HAVE_CXX_FLAG_FSTRICT_ALIASING)
+ add_cxx_compiler_flag(-Wstrict-aliasing)
+ endif()
Added: head/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt Tue May 2 04:18:53 2017 (r439926)
@@ -0,0 +1,32 @@
+--- third_party/boringssl/crypto/CMakeLists.txt.orig 2017-05-01 12:40:52 UTC
++++ third_party/boringssl/crypto/CMakeLists.txt
+@@ -195,29 +195,3 @@ add_executable(
+
+ target_link_libraries(refcount_test crypto)
+ add_dependencies(all_tests refcount_test)
+-
+-# TODO(davidben): Convert the remaining tests to GTest.
+-add_executable(
+- crypto_test
+-
+- asn1/asn1_test.cc
+- bio/bio_test.cc
+- chacha/chacha_test.cc
+- constant_time_test.cc
+- curve25519/x25519_test.cc
+- dh/dh_test.cc
+- dsa/dsa_test.cc
+- ec/ec_test.cc
+- err/err_test.cc
+- evp/evp_extra_test.cc
+- rsa/rsa_test.cc
+-
+- $<TARGET_OBJECTS:gtest_main>
+- $<TARGET_OBJECTS:test_support>
+-)
+-
+-target_link_libraries(crypto_test crypto gtest)
+-if (WIN32)
+- target_link_libraries(crypto_test ws2_32)
+-endif()
+-add_dependencies(all_tests crypto_test)
Modified: head/devel/grpc/pkg-plist
==============================================================================
--- head/devel/grpc/pkg-plist Tue May 2 03:43:15 2017 (r439925)
+++ head/devel/grpc/pkg-plist Tue May 2 04:18:53 2017 (r439926)
@@ -11,6 +11,10 @@ bin/grpc_print_google_default_creds_toke
bin/grpc_python_plugin
bin/grpc_ruby_plugin
bin/grpc_verify_jwt
+include/benchmark/benchmark.h
+include/benchmark/benchmark_api.h
+include/benchmark/macros.h
+include/benchmark/reporter.h
include/grpc++/alarm.h
include/grpc++/channel.h
include/grpc++/client_context.h
@@ -24,6 +28,7 @@ include/grpc++/generic/generic_stub.h
include/grpc++/grpc++.h
include/grpc++/health_check_service_interface.h
include/grpc++/impl/call.h
+include/grpc++/impl/channel_argument_option.h
include/grpc++/impl/client_unary_call.h
include/grpc++/impl/codegen/async_stream.h
include/grpc++/impl/codegen/async_unary_call.h
@@ -81,6 +86,7 @@ include/grpc++/support/async_unary_call.
include/grpc++/support/byte_buffer.h
include/grpc++/support/channel_arguments.h
include/grpc++/support/config.h
+include/grpc++/support/error_details.h
include/grpc++/support/slice.h
include/grpc++/support/status.h
include/grpc++/support/status_code_enum.h
@@ -148,33 +154,39 @@ include/grpc/support/tls_pthread.h
include/grpc/support/useful.h
lib/cmake/gRPC/gRPCConfig.cmake
lib/cmake/gRPC/gRPCConfigVersion.cmake
+lib/libbenchmark.so
+lib/libbenchmark.so.0
+lib/libbenchmark.so.0.0.0
lib/libgpr.so
lib/libgpr.so.1
-lib/libgpr.so.1.2.5
+lib/libgpr.so.1.3.0
lib/libgrpc++.so
lib/libgrpc++.so.1
-lib/libgrpc++.so.1.2.5
+lib/libgrpc++.so.1.3.0
lib/libgrpc++_cronet.so
lib/libgrpc++_cronet.so.1
-lib/libgrpc++_cronet.so.1.2.5
+lib/libgrpc++_cronet.so.1.3.0
+lib/libgrpc++_error_details.so
+lib/libgrpc++_error_details.so.1
+lib/libgrpc++_error_details.so.1.3.0
lib/libgrpc++_reflection.so
lib/libgrpc++_reflection.so.1
-lib/libgrpc++_reflection.so.1.2.5
+lib/libgrpc++_reflection.so.1.3.0
lib/libgrpc++_unsecure.so
lib/libgrpc++_unsecure.so.1
-lib/libgrpc++_unsecure.so.1.2.5
+lib/libgrpc++_unsecure.so.1.3.0
lib/libgrpc.so
lib/libgrpc.so.1
-lib/libgrpc.so.1.2.5
+lib/libgrpc.so.1.3.0
lib/libgrpc_cronet.so
lib/libgrpc_cronet.so.1
-lib/libgrpc_cronet.so.1.2.5
+lib/libgrpc_cronet.so.1.3.0
lib/libgrpc_csharp_ext.so
lib/libgrpc_csharp_ext.so.1
-lib/libgrpc_csharp_ext.so.1.2.5
+lib/libgrpc_csharp_ext.so.1.3.0
lib/libgrpc_plugin_support.so
lib/libgrpc_plugin_support.so.1
-lib/libgrpc_plugin_support.so.1.2.5
+lib/libgrpc_plugin_support.so.1.3.0
lib/libgrpc_unsecure.so
lib/libgrpc_unsecure.so.1
-lib/libgrpc_unsecure.so.1.2.5
+lib/libgrpc_unsecure.so.1.3.0
More information about the svn-ports-all
mailing list