SHA256
1
0
forked from pool/grpc

Accepting request 573170 from devel:tools

- Update to new upstream release 1.9.0

OBS-URL: https://build.opensuse.org/request/show/573170
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grpc?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2018-02-06 15:49:35 +00:00 committed by Git OBS Bridge
commit 520c3f1552
6 changed files with 40 additions and 32 deletions

View File

@ -4,23 +4,22 @@ Date: 2017-12-12 00:32:39.501708666 +0100
openSUSE's c-ares has no c-aresConfig.cmake or c-ares-config.cmake.
Work around it.
---
CMakeLists.txt | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
cmake/cares.cmake | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
Index: grpc-1.7.3/CMakeLists.txt
Index: grpc-1.9.0/cmake/cares.cmake
===================================================================
--- grpc-1.7.3.orig/CMakeLists.txt
+++ grpc-1.7.3/CMakeLists.txt
@@ -144,11 +144,7 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
--- grpc-1.9.0.orig/cmake/cares.cmake
+++ grpc-1.9.0/cmake/cares.cmake
@@ -30,10 +30,5 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
set(gRPC_INSTALL FALSE)
endif()
elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package")
- 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})
- endif()
- set(_gRPC_FIND_CARES "if(NOT c-ares_FOUND)\n find_package(c-ares CONFIG)\nendif()")
+ set(_gRPC_CARES_LIBRARIES -lcares)
+ set(_gRPC_CARES_LIBRARIES -lcares)
endif()
if("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "module")

View File

@ -7,19 +7,19 @@ Unversioned libraries are an ABI nightmare, so work around that in short order.
CMakeLists.txt | 11 +++++++++++
1 file changed, 11 insertions(+)
Index: grpc-1.8.2/CMakeLists.txt
Index: grpc-1.9.0/CMakeLists.txt
===================================================================
--- grpc-1.8.2.orig/CMakeLists.txt
+++ grpc-1.8.2/CMakeLists.txt
@@ -825,6 +825,7 @@ add_library(gpr
src/core/lib/support/tmpfile_windows.cc
src/core/lib/support/wrap_memcpy.cc
--- grpc-1.9.0.orig/CMakeLists.txt
+++ grpc-1.9.0/CMakeLists.txt
@@ -787,6 +787,7 @@ target_link_libraries(gpr_test_util
${_gRPC_ALLTARGETS_LIBRARIES}
gpr
)
+set_target_properties(gpr PROPERTIES OUTPUT_NAME "gpr-${PACKAGE_VERSION}")
if(WIN32 AND MSVC)
set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr"
@@ -1205,6 +1206,7 @@ add_library(grpc
endif (gRPC_BUILD_TESTS)
@@ -1044,6 +1045,7 @@ add_library(grpc
src/core/ext/filters/workarounds/workaround_utils.cc
src/core/plugin_registry/grpc_plugin_registry.cc
)
@ -27,7 +27,7 @@ Index: grpc-1.8.2/CMakeLists.txt
if(WIN32 AND MSVC)
set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc"
@@ -1519,6 +1521,7 @@ add_library(grpc_cronet
@@ -1355,6 +1357,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
)
@ -35,7 +35,7 @@ Index: grpc-1.8.2/CMakeLists.txt
if(WIN32 AND MSVC)
set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet"
@@ -2361,6 +2364,7 @@ add_library(grpc_unsecure
@@ -2192,6 +2195,7 @@ add_library(grpc_unsecure
src/core/ext/filters/workarounds/workaround_utils.cc
src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
)
@ -43,7 +43,7 @@ Index: grpc-1.8.2/CMakeLists.txt
if(WIN32 AND MSVC)
set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure"
@@ -2576,6 +2580,7 @@ add_library(grpc++
@@ -2400,6 +2404,7 @@ add_library(grpc++
src/cpp/util/time_cc.cc
src/cpp/codegen/codegen_init.cc
)
@ -51,7 +51,7 @@ Index: grpc-1.8.2/CMakeLists.txt
if(WIN32 AND MSVC)
set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++"
@@ -3062,6 +3067,7 @@ add_library(grpc++_cronet
@@ -2880,6 +2885,7 @@ add_library(grpc++_cronet
third_party/nanopb/pb_decode.c
third_party/nanopb/pb_encode.c
)
@ -59,7 +59,7 @@ Index: grpc-1.8.2/CMakeLists.txt
if(WIN32 AND MSVC)
set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet"
@@ -3262,6 +3268,7 @@ add_library(grpc++_error_details
@@ -3076,6 +3082,7 @@ add_library(grpc++_error_details
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h
src/cpp/util/error_details.cc
)
@ -67,7 +67,7 @@ Index: grpc-1.8.2/CMakeLists.txt
if(WIN32 AND MSVC)
set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details"
@@ -3388,6 +3395,7 @@ add_library(grpc++_reflection
@@ -3198,6 +3205,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
)
@ -75,7 +75,7 @@ Index: grpc-1.8.2/CMakeLists.txt
if(WIN32 AND MSVC)
set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
@@ -3515,6 +3523,7 @@ add_library(grpc++_test_util
@@ -3321,6 +3329,7 @@ add_library(grpc++_test_util
test/cpp/util/test_credentials_provider.cc
src/cpp/codegen/codegen_init.cc
)
@ -83,7 +83,7 @@ Index: grpc-1.8.2/CMakeLists.txt
if(WIN32 AND MSVC)
set_target_properties(grpc++_test_util PROPERTIES COMPILE_PDB_NAME "grpc++_test_util"
@@ -4124,6 +4133,7 @@ add_library(grpc_plugin_support
@@ -3916,6 +3925,7 @@ add_library(grpc_plugin_support
src/compiler/python_generator.cc
src/compiler/ruby_generator.cc
)
@ -91,7 +91,7 @@ Index: grpc-1.8.2/CMakeLists.txt
if(WIN32 AND MSVC)
set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support"
@@ -4633,6 +4643,7 @@ endif (gRPC_BUILD_TESTS)
@@ -4409,6 +4419,7 @@ endif (gRPC_BUILD_TESTS)
add_library(grpc_csharp_ext SHARED
src/csharp/ext/grpc_csharp_ext.c
)

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Feb 5 22:36:18 UTC 2018 - jengelh@inai.de
- Update to new upstream release 1.9.0
* LB policies request re-resolution without shutting down
* On server, include receiving HTTP/2 settings in handshake
timeout.
* Add thread naming support on platforms that support it.
-------------------------------------------------------------------
Tue Jan 30 21:44:51 UTC 2018 - jengelh@inai.de

View File

@ -16,9 +16,9 @@
#
%define lname libgrpc-1_8_6
%define lname libgrpc-1_9_0
Name: grpc
Version: 1.8.6
Version: 1.9.0
Release: 0
Summary: HTTP/2-based Remote Procedure Call implementation
License: Apache-2.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a525fa5b0d6486a00f85cf65bb3da60ed25f7cb865628f54b7657d1fd1a8802
size 4633179

3
v1.9.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:849679d38daa54aeb3643c9bc830d6b61dca06bed8c72e8dde2e25eff9ad91d5
size 4648677