aboutsummaryrefslogtreecommitdiff
path: root/ports/google-cloud-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ports/google-cloud-cpp')
-rw-r--r--ports/google-cloud-cpp/0001-fix-x86-build.patch13
-rw-r--r--ports/google-cloud-cpp/CONTROL4
-rw-r--r--ports/google-cloud-cpp/portfile.cmake8
3 files changed, 20 insertions, 5 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 2d17390ee..d34d68968 100644
--- a/ports/google-cloud-cpp/CONTROL
+++ b/ports/google-cloud-cpp/CONTROL
@@ -1,5 +1,5 @@
Source: google-cloud-cpp
-Version: 0.14.0-1
-Build-Depends: grpc, curl[ssl], crc32c, googleapis
+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 9ff87e810..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.14.0
- SHA512 f858a448dba27d8f12604a0b1a48c91a660b00a0fb22a7a0f737d3d4a9aac42210dc5221b24d729d577fe4e7da43fd392f1c6fab3923ffe1aae7dca7fd8d6f0e
+ REF v0.17.0
+ SHA512 7bfa73db04fe8ff9344201eca8f56107fd895f18b3be44fca45a9f2d64224338980d04841de4418c5c1b7a8ac0768a60e93e5abbed9256567ca7b8bc2bf73cd9
HEAD_REF master
+ PATCHES
+ 0001-fix-x86-build.patch
)
vcpkg_configure_cmake(
@@ -17,7 +19,7 @@ vcpkg_configure_cmake(
OPTIONS
-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
-DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF
- -DBUILD_TESTING=OFF
+ -DBUILD_TESTING=OFF
)
vcpkg_install_cmake(ADD_BIN_TO_PATH)