Skip to content

[grpc] Update to v1.32.0 - use correct port version #14152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 5 commits into from
Oct 23, 2020
Merged

[grpc] Update to v1.32.0 - use correct port version #14152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c0de7d
[grpc] grpc v1.32.0 - use correct port version
jozefizso Oct 21, 2020
0a854ed
[grpc] update 00001-fix-uwp.patch
jozefizso Oct 21, 2020
4066ba9
[grpc] update 00002-static-linking-in-linux.patch
jozefizso Oct 21, 2020
eaa01db
[grpc] update 00004-link-gdi32-on-windows.patch
jozefizso Oct 21, 2020
205ca7a
[grpc] update 00011-fix-csharp_plugin.patch
jozefizso Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ports/grpc/00001-fix-uwp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a067308142..086d4c5837 100644
index 4655d1e747..b8514d91a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,6 +153,9 @@ if(UNIX)
@@ -181,6 +181,9 @@ if(UNIX)
endif()
if(WIN32)
set(_gRPC_PLATFORM_WINDOWS ON)
Expand All @@ -12,7 +12,7 @@ index a067308142..086d4c5837 100644
endif()

# Use C99 standard
@@ -191,6 +194,9 @@ if(MSVC)
@@ -219,6 +222,9 @@ if(MSVC)
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267")
# TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619")
Expand All @@ -22,7 +22,7 @@ index a067308142..086d4c5837 100644
endif()
if (MINGW)
add_definitions(-D_WIN32_WINNT=0x600)
@@ -258,6 +264,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
@@ -286,6 +292,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
# ``.proto`` files
#
function(protobuf_generate_grpc_cpp)
Expand All @@ -33,15 +33,15 @@ index a067308142..086d4c5837 100644
if(NOT ARGN)
message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
return()
@@ -330,6 +340,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
@@ -358,6 +368,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin)
endif ()

+if(NOT _gRPC_PLATFORM_UWP)
add_custom_target(plugins
DEPENDS ${_gRPC_PLUGIN_LIST}
)
@@ -348,6 +359,7 @@ add_custom_target(tools_cxx
@@ -376,6 +387,7 @@ add_custom_target(tools_cxx

add_custom_target(tools
DEPENDS tools_c tools_cxx)
Expand Down
4 changes: 2 additions & 2 deletions ports/grpc/00002-static-linking-in-linux.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 086d4c5837..e556a99b47 100644
index b8514d91a8..d0e6cbeaf9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,6 +183,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
@@ -211,6 +211,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")

Expand Down
4 changes: 2 additions & 2 deletions ports/grpc/00004-link-gdi32-on-windows.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e556a99b47..a337149f1f 100644
index d0e6cbeaf9..e3fe2990e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,7 +250,7 @@ elseif(UNIX)
@@ -278,7 +278,7 @@ elseif(UNIX)
endif()

if(WIN32)
Expand Down
4 changes: 2 additions & 2 deletions ports/grpc/00011-fix-csharp_plugin.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a23fdf3..df4128a 100644
index a23fdf3dda..7eb8d5200a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1940,10 +1940,14 @@ endif()

if(gRPC_BUILD_CSHARP_EXT)

-add_library(grpc_csharp_ext SHARED
+add_library(grpc_csharp_ext
+add_library(grpc_csharp_ext
src/csharp/ext/grpc_csharp_ext.c
)

Expand Down
2 changes: 1 addition & 1 deletion ports/grpc/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: grpc
Version: 1.31.2
Version: 1.32.0
Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil, re2
Homepage: https://github.com/grpc/grpc
Description: An RPC library and framework
Expand Down