diff options
Diffstat (limited to 'ports/grpc')
| -rw-r--r-- | ports/grpc/00001-fix-uwp.patch | 20 | ||||
| -rw-r--r-- | ports/grpc/00002-static-linking-in-linux.patch | 12 | ||||
| -rw-r--r-- | ports/grpc/00003-undef-base64-macro.patch | 2 | ||||
| -rw-r--r-- | ports/grpc/00004-link-gdi32-on-windows.patch | 6 | ||||
| -rw-r--r-- | ports/grpc/00005-fix-uwp-error.patch | 21 | ||||
| -rw-r--r-- | ports/grpc/00009-use-system-upb.patch | 34 | ||||
| -rw-r--r-- | ports/grpc/00010-add-feature-absl-sync.patch | 8 | ||||
| -rw-r--r-- | ports/grpc/00011-fix-csharp_plugin.patch | 8 | ||||
| -rw-r--r-- | ports/grpc/CONTROL | 5 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 24 | ||||
| -rw-r--r-- | ports/grpc/snprintf.patch | 24 |
11 files changed, 92 insertions, 72 deletions
diff --git a/ports/grpc/00001-fix-uwp.patch b/ports/grpc/00001-fix-uwp.patch index eee4f14d1..a66f03f49 100644 --- a/ports/grpc/00001-fix-uwp.patch +++ b/ports/grpc/00001-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8561c67..84de29f 100644 +index a067308142..086d4c5837 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -150,6 +150,9 @@ if(UNIX) +@@ -153,6 +153,9 @@ if(UNIX) endif() if(WIN32) set(_gRPC_PLATFORM_WINDOWS ON) @@ -12,7 +12,7 @@ index 8561c67..84de29f 100644 endif() # Use C99 standard -@@ -174,6 +177,9 @@ if(MSVC) +@@ -191,6 +194,9 @@ if(MSVC) set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267") # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619") @@ -20,9 +20,9 @@ index 8561c67..84de29f 100644 + add_definitions(-DGRPC_ARES=0) + endif() endif() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_gRPC_C_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_gRPC_C_CXX_FLAGS}") -@@ -237,6 +243,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) + if (MINGW) + add_definitions(-D_WIN32_WINNT=0x600) +@@ -258,6 +264,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) # ``.proto`` files # function(protobuf_generate_grpc_cpp) @@ -33,7 +33,7 @@ index 8561c67..84de29f 100644 if(NOT ARGN) message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") return() -@@ -309,6 +319,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) +@@ -330,6 +340,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin) endif () @@ -41,7 +41,7 @@ index 8561c67..84de29f 100644 add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) -@@ -327,6 +338,7 @@ add_custom_target(tools_cxx +@@ -348,6 +359,7 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) @@ -50,7 +50,7 @@ index 8561c67..84de29f 100644 protobuf_generate_grpc_cpp( src/proto/grpc/channelz/channelz.proto diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc -index 0fc0279..aaf2b09 100644 +index dbe84e3466..cda40b6435 100644 --- a/src/core/lib/iomgr/resource_quota.cc +++ b/src/core/lib/iomgr/resource_quota.cc @@ -945,7 +945,7 @@ bool grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, @@ -63,7 +63,7 @@ index 0fc0279..aaf2b09 100644 bool was_zero_or_negative = resource_user->free_pool <= 0; resource_user->free_pool += static_cast<int64_t>(size); diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -index 59432cf..fed574d 100644 +index 59432cff36..fed574d5bc 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc @@ -39,6 +39,7 @@ bool check_bios_data(const char*) { return false; } diff --git a/ports/grpc/00002-static-linking-in-linux.patch b/ports/grpc/00002-static-linking-in-linux.patch index 371873888..80ec441b3 100644 --- a/ports/grpc/00002-static-linking-in-linux.patch +++ b/ports/grpc/00002-static-linking-in-linux.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 84de29f..0c6dc0e 100644 +index 086d4c5837..e556a99b47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -165,6 +165,11 @@ set(CMAKE_CXX_EXTENSIONS OFF) - - set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) +@@ -183,6 +183,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) + endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") -+ + +if (gRPC_STATIC_LINKING AND NOT _gRPC_PLATFORM_WINDOWS) + # Force to static link + set(CMAKE_EXE_LINKER_FLAGS "-Bstatic") +endif() - ++ if(MSVC) include(cmake/msvc_static_runtime.cmake) + add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) diff --git a/ports/grpc/00003-undef-base64-macro.patch b/ports/grpc/00003-undef-base64-macro.patch index b4beb932f..3f540a534 100644 --- a/ports/grpc/00003-undef-base64-macro.patch +++ b/ports/grpc/00003-undef-base64-macro.patch @@ -1,5 +1,5 @@ diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc -index 6adcd8d..20745df 100644 +index 99a32980aa..f55db67113 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -97,6 +97,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/, diff --git a/ports/grpc/00004-link-gdi32-on-windows.patch b/ports/grpc/00004-link-gdi32-on-windows.patch index 2a6fcea31..1e3e4cf5c 100644 --- a/ports/grpc/00004-link-gdi32-on-windows.patch +++ b/ports/grpc/00004-link-gdi32-on-windows.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4057b3..a6a0f23 100644 +index e556a99b47..a337149f1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -220,7 +220,7 @@ elseif(UNIX) +@@ -250,7 +250,7 @@ elseif(UNIX) endif() - if(WIN32 AND MSVC) + if(WIN32) - set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32) + set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) endif() diff --git a/ports/grpc/00005-fix-uwp-error.patch b/ports/grpc/00005-fix-uwp-error.patch index 93ac05d1b..ad890cf00 100644 --- a/ports/grpc/00005-fix-uwp-error.patch +++ b/ports/grpc/00005-fix-uwp-error.patch @@ -1,8 +1,8 @@ diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc -index c0e2164..331e54c 100644 +index 0dacbfef3e..310bf1de1b 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc -@@ -214,6 +214,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p, +@@ -234,6 +234,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p, size_t len) { uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get()); grpc_slice slice; @@ -10,16 +10,25 @@ index c0e2164..331e54c 100644 if (len <= sizeof(slice.data.inlined.bytes)) { slice.refcount = nullptr; slice.data.inlined.length = len; +@@ -253,7 +254,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr<char> p) { + } + + grpc_slice grpc_slice_from_cpp_string(std::string str) { +- grpc_slice slice; ++ grpc_slice slice = { 0 }; + if (str.size() <= sizeof(slice.data.inlined.bytes)) { + slice.refcount = nullptr; + slice.data.inlined.length = str.size(); diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc -index 998eb6d..a6e26d3 100644 +index cab0cd56c4..2c88fd625b 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc -@@ -1095,7 +1095,7 @@ grpc_call_error queue_call_request(grpc_server* server, size_t cq_idx, +@@ -1301,7 +1301,7 @@ grpc_call_error queue_call_request(grpc_server* server, size_t cq_idx, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); return GRPC_CALL_OK; } - RequestMatcherInterface* rm; + RequestMatcherInterface* rm = nullptr; switch (rc->type) { - case BATCH_CALL: - rm = server->unregistered_request_matcher; + case RequestedCallType::BATCH_CALL: + rm = server->unregistered_request_matcher.get(); diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch index de6f07f5d..0c8c90cf6 100644 --- a/ports/grpc/00009-use-system-upb.patch +++ b/ports/grpc/00009-use-system-upb.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ec669e..f71a212 100644 +index a337149f1f..6baab5d37b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -81,6 +81,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package") +@@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package") set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "Provider of protobuf library") set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package") @@ -12,7 +12,7 @@ index 5ec669e..f71a212 100644 set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package") set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE") -@@ -1765,7 +1768,6 @@ target_link_libraries(grpc +@@ -1807,7 +1810,6 @@ target_link_libraries(grpc ${_gRPC_ALLTARGETS_LIBRARIES} gpr address_sorting @@ -20,7 +20,7 @@ index 5ec669e..f71a212 100644 absl::optional absl::strings absl::inlined_vector -@@ -1844,7 +1846,6 @@ target_link_libraries(grpc_csharp_ext +@@ -1887,7 +1889,6 @@ target_link_libraries(grpc_csharp_ext grpc gpr address_sorting @@ -28,7 +28,7 @@ index 5ec669e..f71a212 100644 ) -@@ -2351,7 +2352,6 @@ target_link_libraries(grpc_unsecure +@@ -2409,7 +2410,6 @@ target_link_libraries(grpc_unsecure ${_gRPC_ALLTARGETS_LIBRARIES} gpr address_sorting @@ -36,7 +36,7 @@ index 5ec669e..f71a212 100644 absl::optional absl::strings absl::inlined_vector -@@ -2545,7 +2545,6 @@ target_link_libraries(grpc++ +@@ -2606,7 +2606,6 @@ target_link_libraries(grpc++ grpc gpr address_sorting @@ -44,7 +44,7 @@ index 5ec669e..f71a212 100644 ) foreach(_hdr -@@ -2821,7 +2820,6 @@ target_link_libraries(grpc++_alts +@@ -2876,7 +2875,6 @@ target_link_libraries(grpc++_alts grpc gpr address_sorting @@ -52,7 +52,7 @@ index 5ec669e..f71a212 100644 ) foreach(_hdr -@@ -2889,7 +2887,6 @@ target_link_libraries(grpc++_error_details +@@ -2945,7 +2943,6 @@ target_link_libraries(grpc++_error_details grpc gpr address_sorting @@ -60,7 +60,7 @@ index 5ec669e..f71a212 100644 ) foreach(_hdr -@@ -2962,7 +2959,6 @@ target_link_libraries(grpc++_reflection +@@ -3019,7 +3016,6 @@ target_link_libraries(grpc++_reflection grpc gpr address_sorting @@ -68,7 +68,7 @@ index 5ec669e..f71a212 100644 ) foreach(_hdr -@@ -3239,7 +3235,6 @@ target_link_libraries(grpc++_unsecure +@@ -3300,7 +3296,6 @@ target_link_libraries(grpc++_unsecure grpc_unsecure gpr address_sorting @@ -76,7 +76,7 @@ index 5ec669e..f71a212 100644 ) foreach(_hdr -@@ -3586,7 +3581,6 @@ target_link_libraries(grpcpp_channelz +@@ -3642,7 +3637,6 @@ target_link_libraries(grpcpp_channelz grpc gpr address_sorting @@ -84,7 +84,7 @@ index 5ec669e..f71a212 100644 ) foreach(_hdr -@@ -3613,6 +3607,7 @@ endif() +@@ -3669,6 +3663,7 @@ endif() endif() @@ -92,7 +92,7 @@ index 5ec669e..f71a212 100644 add_library(upb third_party/upb/upb/decode.c third_party/upb/upb/encode.c -@@ -3662,7 +3657,7 @@ if(gRPC_INSTALL) +@@ -3719,7 +3714,7 @@ if(gRPC_INSTALL) ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() @@ -102,19 +102,19 @@ index 5ec669e..f71a212 100644 add_executable(check_epollexclusive diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in -index 5bfa73c..db0865e 100644 +index 3623f4aa5e..df6ced560e 100644 --- a/cmake/gRPCConfig.cmake.in +++ b/cmake/gRPCConfig.cmake.in -@@ -7,6 +7,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) - @_gRPC_FIND_SSL@ +@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) @_gRPC_FIND_CARES@ @_gRPC_FIND_ABSL@ + @_gRPC_FIND_RE2@ +@_gRPC_FIND_UPB@ # Targets include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) diff --git a/cmake/upb.cmake b/cmake/upb.cmake -index 2c0ab84..07dd613 100644 +index 2c0ab84e67..07dd613a78 100644 --- a/cmake/upb.cmake +++ b/cmake/upb.cmake @@ -12,9 +12,18 @@ diff --git a/ports/grpc/00010-add-feature-absl-sync.patch b/ports/grpc/00010-add-feature-absl-sync.patch index 8fb59a60e..8940cd2d6 100644 --- a/ports/grpc/00010-add-feature-absl-sync.patch +++ b/ports/grpc/00010-add-feature-absl-sync.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f71a212..77cf3de 100644 +index 6baab5d37b..48bc6cf0de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1771,6 +1771,8 @@ target_link_libraries(grpc +@@ -1813,6 +1813,8 @@ target_link_libraries(grpc absl::optional absl::strings absl::inlined_vector @@ -11,7 +11,7 @@ index f71a212..77cf3de 100644 ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc "-framework CoreFoundation") -@@ -2355,6 +2357,8 @@ target_link_libraries(grpc_unsecure +@@ -2413,6 +2415,8 @@ target_link_libraries(grpc_unsecure absl::optional absl::strings absl::inlined_vector @@ -21,7 +21,7 @@ index f71a212..77cf3de 100644 if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_unsecure "-framework CoreFoundation") diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake -index 078d495..b6f50bd 100644 +index 078d495417..b6f50bd14c 100644 --- a/cmake/abseil-cpp.cmake +++ b/cmake/abseil-cpp.cmake @@ -37,4 +37,7 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package") diff --git a/ports/grpc/00011-fix-csharp_plugin.patch b/ports/grpc/00011-fix-csharp_plugin.patch index c2d177113..67450425b 100644 --- a/ports/grpc/00011-fix-csharp_plugin.patch +++ b/ports/grpc/00011-fix-csharp_plugin.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 77cf3de..8bceae6 100644
+index 48bc6cf0de..399aff7d1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1812,10 +1812,14 @@ endif()
+@@ -1854,10 +1854,14 @@ endif()
if(gRPC_BUILD_CSHARP_EXT)
@@ -18,11 +18,11 @@ index 77cf3de..8bceae6 100644 set_target_properties(grpc_csharp_ext PROPERTIES
VERSION ${gRPC_CORE_VERSION}
SOVERSION ${gRPC_CORE_SOVERSION}
-@@ -1829,6 +1833,12 @@ if(WIN32 AND MSVC)
+@@ -1871,6 +1875,12 @@ if(WIN32 AND MSVC)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb
DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL
)
-+
++
+ install(TARGETS grpc_csharp_ext
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index f62df066c..95f05177d 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,7 +1,6 @@ Source: grpc -Version: 1.29.1 -Port-Version: 1 -Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil +Version: 1.31.1 +Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil, re2 Homepage: https://github.com/grpc/grpc Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index cc8fe92be..79e344b54 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF 7d89dbb311f049b43bda7bbf6f7d7bf1b4c24419 #v1.29.1 - SHA512 403fa5e3f012786bb17ca32c760b6dfb22c5a5cfb473ba7fad657e26ab3986eb0203f7cbb501a8647fd5ef2571e5f4ee08c2c97d1dfda18ec5ab6a92c9fc3263 + REF 7d7e4567625db7cfebf8969a225948097a3f9f89 #v1.31.1 + SHA512 a348b8779f533c53b99c052264e0a008121087267bcf836fb2310819ab384effdc0996df031f407ee4bf8bb0cb37a81e061e65ab24ab7011ce6400de3808f5a4 HEAD_REF master PATCHES 00001-fix-uwp.patch @@ -52,12 +52,13 @@ vcpkg_configure_cmake( -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ABSL_PROVIDER=package -DgRPC_UPB_PROVIDER=package + -DgRPC_RE2_PROVIDER=package -DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG -DgRPC_CARES_PROVIDER=${cares_CARES_PROVIDER} -DgRPC_GFLAGS_PROVIDER=none -DgRPC_BENCHMARK_PROVIDER=none -DgRPC_INSTALL_CSHARP_EXT=OFF - -DgRPC_INSTALL_BINDIR:STRING=tools/grpc + -DgRPC_INSTALL_BINDIR:STRING=bin -DgRPC_INSTALL_LIBDIR:STRING=lib -DgRPC_INSTALL_INCLUDEDIR:STRING=include -DgRPC_INSTALL_CMAKEDIR:STRING=share/gRPC @@ -68,10 +69,21 @@ vcpkg_install_cmake(ADD_BIN_TO_PATH) vcpkg_fixup_cmake_targets(CONFIG_PATH share/gRPC TARGET_PATH share/gRPC) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/grpc RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/grpc) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") +if (gRPC_BUILD_CODEGEN) + vcpkg_copy_tools( + AUTO_CLEAN + TOOL_NAMES + grpc_php_plugin + grpc_python_plugin + grpc_node_plugin + grpc_objective_c_plugin + grpc_csharp_plugin + grpc_cpp_plugin + grpc_ruby_plugin + ) +endif() # Ignore the C# extension DLL in bin/ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/grpc/snprintf.patch b/ports/grpc/snprintf.patch index f658f9c4f..d1fd52e48 100644 --- a/ports/grpc/snprintf.patch +++ b/ports/grpc/snprintf.patch @@ -1,12 +1,12 @@ -diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc
-index c638ce7..3dc3b2e 100644
---- a/src/core/tsi/alts/crypt/aes_gcm.cc
-+++ b/src/core/tsi/alts/crypt/aes_gcm.cc
-@@ -28,6 +28,7 @@
- #include <openssl/evp.h>
- #include <openssl/hmac.h>
- #include <string.h>
-+#include <cstdio>
-
- #include <grpc/support/alloc.h>
-
+diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc +index 02b1ac4492..191f462277 100644 +--- a/src/core/tsi/alts/crypt/aes_gcm.cc ++++ b/src/core/tsi/alts/crypt/aes_gcm.cc +@@ -26,6 +26,7 @@ + #include <openssl/evp.h> + #include <openssl/hmac.h> + #include <string.h> ++#include <cstdio> + + #include <grpc/support/alloc.h> + |
