diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2020-01-13 11:49:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 11:49:15 -0800 |
| commit | 9a510168c7102722fac448c0fe3c630d303e5d6e (patch) | |
| tree | dc1940519111b00f8015c199a90cc43f7c4084ab /ports/google-cloud-cpp | |
| parent | e46a029bf727fa3347f1caec2dc26cef43ec3ac6 (diff) | |
| parent | ecf83936b291ca2a28f36d8e39d5b191f4b2b193 (diff) | |
| download | vcpkg-9a510168c7102722fac448c0fe3c630d303e5d6e.tar.gz vcpkg-9a510168c7102722fac448c0fe3c630d303e5d6e.zip | |
Merge branch 'master' into dev/jack/update_osx_baseline
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 | 2 | ||||
| -rw-r--r-- | ports/google-cloud-cpp/portfile.cmake | 6 |
3 files changed, 18 insertions, 3 deletions
diff --git a/ports/google-cloud-cpp/0001-fix-x86-build.patch b/ports/google-cloud-cpp/0001-fix-x86-build.patch new file mode 100644 index 000000000..ec3674cb7 --- /dev/null +++ b/ports/google-cloud-cpp/0001-fix-x86-build.patch @@ -0,0 +1,13 @@ +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 c593a3d6b..d34d68968 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,5 +1,5 @@ Source: google-cloud-cpp -Version: 0.15.0 +Version: 0.17.0 Build-Depends: grpc, curl[ssl], crc32c, googleapis, google-cloud-cpp-common Description: C++ Client Libraries for Google Cloud Platform APIs. Homepage: https://github.com/googleapis/google-cloud-cpp diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index aff9a25a5..ff177b31c 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,9 +5,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v0.15.0 - SHA512 f8cc8f9d47a4df1d76ac7b0836fe107f2f199070a89ab5136f66aa1be5f08737495dbb3f4cf7f709ac0a1346648d869af639836b85b552c6791fa8bb85362a91 + REF v0.17.0 + SHA512 7bfa73db04fe8ff9344201eca8f56107fd895f18b3be44fca45a9f2d64224338980d04841de4418c5c1b7a8ac0768a60e93e5abbed9256567ca7b8bc2bf73cd9 HEAD_REF master + PATCHES + 0001-fix-x86-build.patch ) vcpkg_configure_cmake( |