diff options
| author | Jozef Izso <jozef.izso@gmail.com> | 2018-04-26 15:23:44 +0200 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-06-29 19:34:29 -0700 |
| commit | e524ada9f4f412f194686ae00db5b8da5735667d (patch) | |
| tree | 4c18e988d2e40e38c5d3f7bb2809706a07e002d6 | |
| parent | 5e719d40e23e1138a690a2b711942a8c4b181043 (diff) | |
| download | vcpkg-e524ada9f4f412f194686ae00db5b8da5735667d.tar.gz vcpkg-e524ada9f4f412f194686ae00db5b8da5735667d.zip | |
[grpc] Merge 2 patches
| -rw-r--r-- | ports/grpc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/grpc/disable-csharp-ext-2.patch | 20 | ||||
| -rw-r--r-- | ports/grpc/disable-csharp-ext.patch | 29 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 1 |
4 files changed, 12 insertions, 40 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index 71c9f9d29..71ccb3a86 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.10.1-2 +Version: 1.10.1-3 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp) Description: An RPC library and framework diff --git a/ports/grpc/disable-csharp-ext-2.patch b/ports/grpc/disable-csharp-ext-2.patch deleted file mode 100644 index 1bc863105..000000000 --- a/ports/grpc/disable-csharp-ext-2.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0dc0bd3..7f702cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4699,6 +4699,7 @@ endif (gRPC_BUILD_TESTS)
-
- option(gRPC_INSTALL_CSHARP_EXT "" ON)
-
-+if(gRPC_INSTALL_CSHARP_EXT)
- add_library(grpc_csharp_ext SHARED
- src/csharp/ext/grpc_csharp_ext.c
- )
-@@ -4741,6 +4742,7 @@ if (gRPC_INSTALL AND gRPC_INSTALL_CSHARP_EXT)
- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
- )
- endif()
-+endif()
-
- if (gRPC_BUILD_TESTS)
-
diff --git a/ports/grpc/disable-csharp-ext.patch b/ports/grpc/disable-csharp-ext.patch index 3b887c8b4..5f3a78691 100644 --- a/ports/grpc/disable-csharp-ext.patch +++ b/ports/grpc/disable-csharp-ext.patch @@ -1,29 +1,22 @@ ---- a/CMakeLists.txt Tue Aug 29 22:24:15 2017 -+++ b/CMakeLists.txt Mon Sep 04 00:43:56 2017 -@@ -4574,6 +4574,8 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c285e7..cffd93f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5058,6 +5058,9 @@ endif (gRPC_BUILD_CODEGEN) endif (gRPC_BUILD_TESTS) +option(gRPC_INSTALL_CSHARP_EXT "" ON) + ++if (gRPC_INSTALL_CSHARP_EXT) add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c ) -@@ -4582,7 +4584,7 @@ - set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext" - COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" +@@ -5101,6 +5104,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) -- if (gRPC_INSTALL) -+ if (gRPC_INSTALL AND gRPC_INSTALL_CSHARP_EXT) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb - DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL - ) -@@ -4613,7 +4615,7 @@ + endif() ++endif (gRPC_INSTALL_CSHARP_EXT) + if (gRPC_BUILD_TESTS) - --if (gRPC_INSTALL) -+if (gRPC_INSTALL AND gRPC_INSTALL_CSHARP_EXT) - install(TARGETS grpc_csharp_ext EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 259fd222e..375128a0a 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -17,7 +17,6 @@ vcpkg_from_github( HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-csharp-ext.patch - ${CMAKE_CURRENT_LIST_DIR}/disable-csharp-ext-2.patch ${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch ) |