diff options
| author | yurybura <yurybura@gmail.com> | 2018-05-11 13:34:43 +0300 |
|---|---|---|
| committer | yurybura <yurybura@gmail.com> | 2018-05-11 13:34:43 +0300 |
| commit | 7d261fbbc39a1d36027299190920e0a7e222ebd7 (patch) | |
| tree | d9b6745f2e6c670836cbbf61dbd2c4eb9ef857fe /ports/grpc | |
| parent | 50e5ee1e40380cf543ae804775462181984a86dc (diff) | |
| parent | 9535a5631ac212b1c657a02be3ed9398df30c96c (diff) | |
| download | vcpkg-7d261fbbc39a1d36027299190920e0a7e222ebd7.tar.gz vcpkg-7d261fbbc39a1d36027299190920e0a7e222ebd7.zip | |
Merge branch 'master' of https://github.com/yurybura/vcpkg
Diffstat (limited to 'ports/grpc')
| -rw-r--r-- | ports/grpc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/grpc/disable-csharp-ext-2.patch | 20 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 13 |
3 files changed, 30 insertions, 5 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index 707c8cb8b..6f8f18467 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.10.0 +Version: 1.10.1-1 Build-Depends: zlib, openssl, protobuf, c-ares Description: An RPC library and framework diff --git a/ports/grpc/disable-csharp-ext-2.patch b/ports/grpc/disable-csharp-ext-2.patch new file mode 100644 index 000000000..1bc863105 --- /dev/null +++ b/ports/grpc/disable-csharp-ext-2.patch @@ -0,0 +1,20 @@ +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/portfile.cmake b/ports/grpc/portfile.cmake index abab22925..54f294896 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.10.0 - SHA512 52a3e2710fd51b92fb6345cddb9fd64a9b826bcb85dba86075b5e8465abf6dbc26a9245c9f79dd68b0c11a4fa3b983513091000991b61d77761b7debcdac3703 + REF v1.10.1 + SHA512 2221d902c60eada6dd1547a63d26bd3b30cb6710247b5e48523bacde498a3691cc177f1dbe9db8a007b8ae341a5b0c8ec999539e26a9bcff480a8d0b02140997 HEAD_REF master ) @@ -22,6 +22,7 @@ vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-csharp-ext.patch + ${CMAKE_CURRENT_LIST_DIR}/disable-csharp-ext-2.patch ) if(VCPKG_CRT_LINKAGE STREQUAL static) @@ -66,8 +67,12 @@ if(TOOLS) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/grpc) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +else() + SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) # Leave the executable files in bin/ and debug/bin +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() |