diff options
| author | Carlos O'Ryan <coryan@users.noreply.github.com> | 2020-06-03 01:46:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-02 22:46:06 -0700 |
| commit | 0dbc334ef55db4348b870bd3db12a0b4b7d96df8 (patch) | |
| tree | 7ba78fde946cb62745d9825b9770e490855937a1 /ports/google-cloud-cpp | |
| parent | 0243e00c53652d353ffd2a5fece01193a290254b (diff) | |
| download | vcpkg-0dbc334ef55db4348b870bd3db12a0b4b7d96df8.tar.gz vcpkg-0dbc334ef55db4348b870bd3db12a0b4b7d96df8.zip | |
[google-cloud-cpp] Consolidate all google-cloud* packages (#11698)
* [google-cloud-cpp] Consolidate all google-cloud* packages
Starting with the v1.14.0 release all google-cloud* packages and the
googleapis package are kept in a single repository and released
simultaneously.
* Update CI baseline.
google-cloud-cpp used to inherit failures from googleapis, which
indicates these are (probably) problems in the generated protobuf/grpc
code.
Diffstat (limited to 'ports/google-cloud-cpp')
| -rw-r--r-- | ports/google-cloud-cpp/0001-fix-x86-build.patch | 13 | ||||
| -rw-r--r-- | ports/google-cloud-cpp/CONTROL | 5 | ||||
| -rw-r--r-- | ports/google-cloud-cpp/portfile.cmake | 8 |
3 files changed, 6 insertions, 20 deletions
diff --git a/ports/google-cloud-cpp/0001-fix-x86-build.patch b/ports/google-cloud-cpp/0001-fix-x86-build.patch deleted file mode 100644 index ec3674cb7..000000000 --- a/ports/google-cloud-cpp/0001-fix-x86-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/google/cloud/storage/parallel_upload.h b/google/cloud/storage/parallel_upload.h -index 44f542d..4fd97bd 100644 ---- a/google/cloud/storage/parallel_upload.h -+++ b/google/cloud/storage/parallel_upload.h -@@ -515,7 +515,7 @@ StatusOr<std::vector<ParallelUploadFileShard>> CreateUploadShards( - - std::size_t const wanted_num_streams = - (std::max<std::size_t>)(1, -- (std::min)(max_streams, -+ (std::min<std::size_t>)(max_streams, - div_ceil(file_size, min_stream_size))); - - std::uintmax_t const stream_size = diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index ba320d8f2..715c0c153 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,5 +1,6 @@ Source: google-cloud-cpp -Version: 0.21.0 -Build-Depends: grpc, curl[ssl], crc32c, googleapis, google-cloud-cpp-common +Version: 1.14.0 +Build-Depends: abseil, grpc, curl[ssl], crc32c Description: C++ Client Libraries for Google Cloud Platform APIs. Homepage: https://github.com/googleapis/google-cloud-cpp +Supports: !uwp diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 0bb7ef742..601f2b3db 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v0.21.0 - SHA512 744c7a14c31966df1f1383ad5804428807babf53079ed96514367f145eb38b4b90be3e0f9c6f16deb9269c754fd5a44e898e5afb77f6f749ba968605d79b8397 + REF v1.14.0 + SHA512 73ab8fd6167616ff0671c15b59afe0a0c8816badd873293d3645b46f74d5f4dfc7f89de84019c5933c132c3d061456067f686f72c1c5e775d9e8a3dae3cdc63f HEAD_REF master - PATCHES - 0001-fix-x86-build.patch ) vcpkg_configure_cmake( @@ -15,8 +13,8 @@ vcpkg_configure_cmake( PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS - -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF + -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF -DBUILD_TESTING=OFF ) |