aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJozef Izso <jozef.izso@gmail.com>2017-11-09 10:57:35 +0100
committerAlexander Karatarakis <alex@karatarakis.com>2017-11-09 21:43:44 -0800
commit2c4d1dc17f0ddd9443447a9e671fcf8e5d9311f7 (patch)
tree04b5648f5c51d97c45c3c25847214f8888c2c14b
parentcd41cfe468d453a9c5d9ceb601f0e5aba988113a (diff)
downloadvcpkg-2c4d1dc17f0ddd9443447a9e671fcf8e5d9311f7.tar.gz
vcpkg-2c4d1dc17f0ddd9443447a9e671fcf8e5d9311f7.zip
Update grpc port to release 1.7.0
-rw-r--r--ports/grpc/CONTROL2
-rw-r--r--ports/grpc/portfile.cmake12
2 files changed, 3 insertions, 11 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index 958ab7723..b866586fe 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,4 +1,4 @@
Source: grpc
-Version: 1.6.0-2
+Version: 1.7.0
Build-Depends: zlib, openssl, protobuf, c-ares
Description: An RPC library and framework
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 791470bc2..4b7473105 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -12,24 +12,16 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc
- REF v1.6.0
- SHA512 70a68fecca43cfe8c94206fd39ad8f86e055eb2185ae8c90040cc35928f1102016775c66e83c3cc76690e44598764b215d884a206f8466d45b00e2c54593e682
+ REF v1.7.0
+ SHA512 23427ac1f180ce6d70b039225f26cecbd938655d1e5b726414aee7dfee6e6f301913255cfe0ff326dfb34e206ca6476c389b2fd0db58b284fff30c9757c5e4ac
HEAD_REF master
)
-# fix from PR https://github.com/grpc/grpc/pull/12411
-vcpkg_download_distfile(CMAKE_ERROR_FIX_DIFF
- URLS "https://github.com/grpc/grpc/commit/74c139a83987087f9e2d2e6b5d44c240d719061d.diff"
- FILENAME "grpc-cmake-error-fix.diff"
- SHA512 38cdff0e6db12276400cf4eec66aafdbfe34912a78a0604ced3b216d3a60e5b87464f9083fa5e5dfb4df1490ef10565cbe04d3f750f59c7e7e1a05334c0b528e
-)
-
# Issue: https://github.com/grpc/grpc/issues/10759
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/disable-csharp-ext.patch
- ${CMAKE_ERROR_FIX_DIFF}
)
if(VCPKG_CRT_LINKAGE STREQUAL static)