early-access version 2853
This commit is contained in:
73
externals/vcpkg/ports/grpc/00001-fix-uwp.patch
vendored
Executable file
73
externals/vcpkg/ports/grpc/00001-fix-uwp.patch
vendored
Executable file
@@ -0,0 +1,73 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7a97604..4967c4f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -215,6 +215,9 @@ if(UNIX)
|
||||
endif()
|
||||
if(WIN32)
|
||||
set(_gRPC_PLATFORM_WINDOWS ON)
|
||||
+ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||||
+ set(_gRPC_PLATFORM_UWP ON)
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
# Use C99 standard
|
||||
@@ -259,6 +262,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")
|
||||
+ if(_gRPC_PLATFORM_UWP)
|
||||
+ add_definitions(-DGRPC_ARES=0)
|
||||
+ endif()
|
||||
# Silences thousands of trucation warnings
|
||||
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503")
|
||||
endif()
|
||||
@@ -336,6 +342,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
|
||||
# ``.proto`` files
|
||||
#
|
||||
function(protobuf_generate_grpc_cpp)
|
||||
+ if(_gRPC_PLATFORM_UWP)
|
||||
+ return()
|
||||
+ endif()
|
||||
+
|
||||
if(NOT ARGN)
|
||||
message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
|
||||
return()
|
||||
@@ -408,6 +418,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
|
||||
list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin)
|
||||
endif ()
|
||||
|
||||
+if(NOT _gRPC_PLATFORM_UWP)
|
||||
add_custom_target(plugins
|
||||
DEPENDS ${_gRPC_PLUGIN_LIST}
|
||||
)
|
||||
@@ -424,6 +435,7 @@ add_custom_target(tools_cxx
|
||||
|
||||
add_custom_target(tools
|
||||
DEPENDS tools_c tools_cxx)
|
||||
+endif()
|
||||
|
||||
protobuf_generate_grpc_cpp(
|
||||
src/proto/grpc/channelz/channelz.proto
|
||||
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 5d2bdc1..e9870c2 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; }
|
||||
bool check_windows_registry_product_name(HKEY root_key,
|
||||
const char* reg_key_path,
|
||||
const char* reg_key_name) {
|
||||
+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
|
||||
const size_t kProductNameBufferSize = 256;
|
||||
char const expected_substr[] = "Google";
|
||||
|
||||
@@ -71,6 +72,9 @@ bool check_windows_registry_product_name(HKEY root_key,
|
||||
}
|
||||
|
||||
return strstr(buffer, expected_substr) != nullptr;
|
||||
+#else
|
||||
+ return false;
|
||||
+#endif
|
||||
}
|
||||
|
||||
} // namespace internal
|
||||
16
externals/vcpkg/ports/grpc/00002-static-linking-in-linux.patch
vendored
Executable file
16
externals/vcpkg/ports/grpc/00002-static-linking-in-linux.patch
vendored
Executable file
@@ -0,0 +1,16 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8f78306f77..e09f8fcc1e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -211,6 +211,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)
|
||||
13
externals/vcpkg/ports/grpc/00003-undef-base64-macro.patch
vendored
Executable file
13
externals/vcpkg/ports/grpc/00003-undef-base64-macro.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
|
||||
index 5d74ec2..89494b5 100644
|
||||
--- a/src/core/lib/transport/transport.cc
|
||||
+++ b/src/core/lib/transport/transport.cc
|
||||
@@ -77,6 +77,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/,
|
||||
: nullptr);
|
||||
}
|
||||
|
||||
+#undef move64
|
||||
+
|
||||
static void move64bits(uint64_t* from, uint64_t* to) {
|
||||
*to += *from;
|
||||
*from = 0;
|
||||
13
externals/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch
vendored
Executable file
13
externals/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 14514b7..497470c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -323,7 +323,7 @@ include(cmake/xxhash.cmake)
|
||||
include(cmake/zlib.cmake)
|
||||
|
||||
if(WIN32)
|
||||
- set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32)
|
||||
+ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)
|
||||
endif()
|
||||
|
||||
# Create directory for generated .proto files
|
||||
34
externals/vcpkg/ports/grpc/00005-fix-uwp-error.patch
vendored
Executable file
34
externals/vcpkg/ports/grpc/00005-fix-uwp-error.patch
vendored
Executable file
@@ -0,0 +1,34 @@
|
||||
diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
|
||||
index 0dacbfef3e..0743a1b003 100644
|
||||
--- a/src/core/lib/slice/slice.cc
|
||||
+++ b/src/core/lib/slice/slice.cc
|
||||
@@ -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;
|
||||
+ memset(&slice, 0, sizeof(grpc_slice));
|
||||
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 c94551545d..3fd9797316 100644
|
||||
--- a/src/core/lib/surface/server.cc
|
||||
+++ b/src/core/lib/surface/server.cc
|
||||
@@ -878,7 +878,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) {
|
||||
GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown"));
|
||||
return GRPC_CALL_OK;
|
||||
}
|
||||
- RequestMatcherInterface* rm;
|
||||
+ RequestMatcherInterface* rm = nullptr;
|
||||
switch (rc->type) {
|
||||
case RequestedCall::Type::BATCH_CALL:
|
||||
rm = unregistered_request_matcher_.get();
|
||||
13
externals/vcpkg/ports/grpc/00006-fix-uwp-error.patch
vendored
Executable file
13
externals/vcpkg/ports/grpc/00006-fix-uwp-error.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
|
||||
index 18abbda..9789983 100644
|
||||
--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc
|
||||
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
|
||||
@@ -1052,7 +1052,7 @@ class HPackParser::Parser {
|
||||
|
||||
private:
|
||||
void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) {
|
||||
- const char* type;
|
||||
+ const char* type = nullptr;
|
||||
switch (log_info_.type) {
|
||||
case LogInfo::kHeaders:
|
||||
type = "HDR";
|
||||
78
externals/vcpkg/ports/grpc/00009-use-system-upb.patch
vendored
Executable file
78
externals/vcpkg/ports/grpc/00009-use-system-upb.patch
vendored
Executable file
@@ -0,0 +1,78 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1c3146b..ae06ea3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -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")
|
||||
|
||||
+set(gRPC_UPB_PROVIDER "module" CACHE STRING "Provider of upb library")
|
||||
+set_property(CACHE gRPC_UPB_PROVIDER PROPERTY STRINGS "module" "package")
|
||||
+
|
||||
set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")
|
||||
set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")
|
||||
|
||||
@@ -1504,7 +1507,6 @@ target_link_libraries(gpr
|
||||
absl::synchronization
|
||||
absl::time
|
||||
absl::optional
|
||||
- upb
|
||||
)
|
||||
if(_gRPC_PLATFORM_ANDROID)
|
||||
target_link_libraries(gpr
|
||||
@@ -3927,6 +3929,7 @@ endif()
|
||||
|
||||
endif()
|
||||
|
||||
+if (gRPC_UPB_PROVIDER STREQUAL "module")
|
||||
add_library(upb
|
||||
third_party/upb/upb/decode_fast.c
|
||||
third_party/upb/upb/decode.c
|
||||
@@ -3984,7 +3987,7 @@ if(gRPC_INSTALL)
|
||||
)
|
||||
endif()
|
||||
|
||||
-
|
||||
+endif()
|
||||
|
||||
add_executable(check_epollexclusive
|
||||
test/build/check_epollexclusive.c
|
||||
diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
|
||||
index 3623f4a..df6ced5 100644
|
||||
--- a/cmake/gRPCConfig.cmake.in
|
||||
+++ b/cmake/gRPCConfig.cmake.in
|
||||
@@ -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 f2a0e50..ac6d397 100644
|
||||
--- a/cmake/upb.cmake
|
||||
+++ b/cmake/upb.cmake
|
||||
@@ -12,9 +12,21 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
+set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
|
||||
+if (gRPC_UPB_PROVIDER STREQUAL "module")
|
||||
+
|
||||
set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)
|
||||
|
||||
set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
|
||||
set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
|
||||
|
||||
set(_gRPC_UPB_LIBRARIES upb)
|
||||
+
|
||||
+
|
||||
+elseif(gRPC_UPB_PROVIDER STREQUAL "package")
|
||||
+ find_package(upb CONFIG REQUIRED)
|
||||
+ set(_gRPC_UPB_LIBRARIES upb::upb)
|
||||
+ set(_gRPC_UPB_INCLUDE_DIR)
|
||||
+ set(upb ${_gRPC_UPB_LIBRARIES})
|
||||
+ set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG REQUIRED)\nendif()")
|
||||
+endif()
|
||||
\ No newline at end of file
|
||||
33
externals/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch
vendored
Executable file
33
externals/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch
vendored
Executable file
@@ -0,0 +1,33 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 497470c..9c07732 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -2196,6 +2196,8 @@ target_link_libraries(grpc
|
||||
${_gRPC_UPB_LIBRARIES}
|
||||
${_gRPC_ALLTARGETS_LIBRARIES}
|
||||
absl::flat_hash_map
|
||||
+ absl::time
|
||||
+ absl::synchronization
|
||||
absl::inlined_vector
|
||||
absl::bind_front
|
||||
absl::hash
|
||||
@@ -2753,6 +2755,8 @@ target_link_libraries(grpc_unsecure
|
||||
${_gRPC_UPB_LIBRARIES}
|
||||
${_gRPC_ALLTARGETS_LIBRARIES}
|
||||
absl::flat_hash_map
|
||||
+ absl::time
|
||||
+ absl::synchronization
|
||||
absl::inlined_vector
|
||||
absl::bind_front
|
||||
absl::statusor
|
||||
diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake
|
||||
index c89ba26..81212b9 100644
|
||||
--- a/cmake/abseil-cpp.cmake
|
||||
+++ b/cmake/abseil-cpp.cmake
|
||||
@@ -35,3 +35,6 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package")
|
||||
find_package(absl REQUIRED CONFIG)
|
||||
endif()
|
||||
set(_gRPC_FIND_ABSL "if(NOT TARGET absl::strings)\n find_package(absl CONFIG)\nendif()")
|
||||
+ if (gRPC_ABSL_SYNC_ENABLE)
|
||||
+ add_definitions(-DGPR_ABSEIL_SYNC=1)
|
||||
+ endif()
|
||||
33
externals/vcpkg/ports/grpc/00011-fix-csharp_plugin.patch
vendored
Executable file
33
externals/vcpkg/ports/grpc/00011-fix-csharp_plugin.patch
vendored
Executable file
@@ -0,0 +1,33 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ae77375eae..ad8815d2f9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1960,10 +1960,14 @@ endif()
|
||||
|
||||
if(gRPC_BUILD_CSHARP_EXT)
|
||||
|
||||
-add_library(grpc_csharp_ext SHARED
|
||||
+add_library(grpc_csharp_ext
|
||||
src/csharp/ext/grpc_csharp_ext.c
|
||||
)
|
||||
|
||||
+if (WIN32 AND BUILD_SHARED_LIBS)
|
||||
+ target_compile_definitions(grpc_csharp_ext PUBLIC GPR_WINDOWS)
|
||||
+endif()
|
||||
+
|
||||
set_target_properties(grpc_csharp_ext PROPERTIES
|
||||
VERSION ${gRPC_CORE_VERSION}
|
||||
SOVERSION ${gRPC_CORE_SOVERSION}
|
||||
@@ -1977,6 +1981,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}
|
||||
+ ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
+ )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
16
externals/vcpkg/ports/grpc/00012-fix-use-cxx17.patch
vendored
Executable file
16
externals/vcpkg/ports/grpc/00012-fix-use-cxx17.patch
vendored
Executable file
@@ -0,0 +1,16 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9c07732..54b4b23 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -321,6 +321,11 @@ include(cmake/ssl.cmake)
|
||||
include(cmake/upb.cmake)
|
||||
include(cmake/xxhash.cmake)
|
||||
include(cmake/zlib.cmake)
|
||||
+
|
||||
+if (ABSL_USE_CXX17)
|
||||
+ message(STATUS "Found absl uses CXX17, enable CXX17 feature.")
|
||||
+ set(CMAKE_CXX_STANDARD 17)
|
||||
+endif()
|
||||
|
||||
if(WIN32)
|
||||
set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)
|
||||
28
externals/vcpkg/ports/grpc/00013-build-upbdefs.patch
vendored
Executable file
28
externals/vcpkg/ports/grpc/00013-build-upbdefs.patch
vendored
Executable file
@@ -0,0 +1,28 @@
|
||||
diff --git a/cmake/upb.cmake b/cmake/upb.cmake
|
||||
index 59d6813..1ce8bce 100644
|
||||
--- a/cmake/upb.cmake
|
||||
+++ b/cmake/upb.cmake
|
||||
@@ -24,8 +24,21 @@ set(_gRPC_UPB_LIBRARIES upb)
|
||||
|
||||
elseif(gRPC_UPB_PROVIDER STREQUAL "package")
|
||||
find_package(upb CONFIG REQUIRED)
|
||||
- set(_gRPC_UPB_LIBRARIES upb::upb)
|
||||
+ set(_gRPC_UPB_LIBRARIES upb)
|
||||
set(_gRPC_UPB_INCLUDE_DIR)
|
||||
- set(upb ${_gRPC_UPB_LIBRARIES})
|
||||
+ add_library(upb STATIC
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
|
||||
+ )
|
||||
+ set_target_properties(upb PROPERTIES OUTPUT_NAME grpc_upbdefs)
|
||||
+ target_include_directories(upb PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
|
||||
+ target_link_libraries(upb PUBLIC upb::all_libs)
|
||||
+ if(gRPC_INSTALL)
|
||||
+ install(TARGETS upb EXPORT gRPCTargets
|
||||
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
|
||||
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
|
||||
+ )
|
||||
+ endif()
|
||||
set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG REQUIRED)\nendif()")
|
||||
endif()
|
||||
13
externals/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch
vendored
Executable file
13
externals/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 54b4b23..83fab3b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -17276,7 +17276,7 @@ generate_pkgconfig(
|
||||
"high performance general RPC framework"
|
||||
"${gRPC_CORE_VERSION}"
|
||||
"gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant"
|
||||
- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
|
||||
+ "-lgrpc -lgrpc_upbdefs -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz"
|
||||
""
|
||||
"grpc.pc")
|
||||
|
||||
10
externals/vcpkg/ports/grpc/gRPCTargets-vcpkg-tools.cmake
vendored
Executable file
10
externals/vcpkg/ports/grpc/gRPCTargets-vcpkg-tools.cmake
vendored
Executable file
@@ -0,0 +1,10 @@
|
||||
file(GLOB GRPC_PLUGINS "${_IMPORT_PREFIX}/../@HOST_TRIPLET@/tools/grpc/grpc_*_plugin*")
|
||||
|
||||
foreach(PLUGIN ${GRPC_PLUGINS})
|
||||
get_filename_component(PLUGIN_NAME "${PLUGIN}" NAME_WE)
|
||||
add_executable(gRPC::${PLUGIN_NAME} IMPORTED)
|
||||
set_property(TARGET gRPC::${PLUGIN_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(gRPC::${PLUGIN_NAME} PROPERTIES
|
||||
IMPORTED_LOCATION_RELEASE "${PLUGIN}"
|
||||
)
|
||||
endforeach()
|
||||
100
externals/vcpkg/ports/grpc/portfile.cmake
vendored
Executable file
100
externals/vcpkg/ports/grpc/portfile.cmake
vendored
Executable file
@@ -0,0 +1,100 @@
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
endif()
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO grpc/grpc
|
||||
REF 591d56e1300b6d11948e1b821efac785a295989c # v1.44.0
|
||||
SHA512 b24f82768eed95b017a499ffb539af1f59d6916ab2da5ffb1de344ea7b0b7df536d1bb29a9bcb273bd84bc1f11b62383dc6c7df62e50d57621228f5aeeca6d5d
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
00001-fix-uwp.patch
|
||||
00002-static-linking-in-linux.patch
|
||||
00003-undef-base64-macro.patch
|
||||
00004-link-gdi32-on-windows.patch
|
||||
00005-fix-uwp-error.patch
|
||||
00006-fix-uwp-error.patch
|
||||
00009-use-system-upb.patch
|
||||
00010-add-feature-absl-sync.patch
|
||||
00011-fix-csharp_plugin.patch
|
||||
snprintf.patch
|
||||
00012-fix-use-cxx17.patch
|
||||
00013-build-upbdefs.patch
|
||||
00014-pkgconfig-upbdefs.patch
|
||||
)
|
||||
|
||||
if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)
|
||||
vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")
|
||||
endif()
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" gRPC_MSVC_STATIC_RUNTIME)
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" gRPC_STATIC_LINKING)
|
||||
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
set(cares_CARES_PROVIDER OFF)
|
||||
else()
|
||||
set(cares_CARES_PROVIDER "package")
|
||||
endif()
|
||||
|
||||
vcpkg_check_features(
|
||||
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
absl-sync gRPC_ABSL_SYNC_ENABLE
|
||||
codegen gRPC_BUILD_CODEGEN
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS ${FEATURE_OPTIONS}
|
||||
-DgRPC_INSTALL=ON
|
||||
-DgRPC_BUILD_TESTS=OFF
|
||||
-DgRPC_STATIC_LINKING=${gRPC_STATIC_LINKING}
|
||||
-DgRPC_MSVC_STATIC_RUNTIME=${gRPC_MSVC_STATIC_RUNTIME}
|
||||
-DgRPC_ZLIB_PROVIDER=package
|
||||
-DgRPC_SSL_PROVIDER=package
|
||||
-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_BENCHMARK_PROVIDER=none
|
||||
-DgRPC_INSTALL_BINDIR:STRING=bin
|
||||
-DgRPC_INSTALL_LIBDIR:STRING=lib
|
||||
-DgRPC_INSTALL_INCLUDEDIR:STRING=include
|
||||
-DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc
|
||||
"-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
|
||||
"-DPROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
gRPC_MSVC_STATIC_RUNTIME
|
||||
)
|
||||
|
||||
vcpkg_cmake_install(ADD_BIN_TO_PATH)
|
||||
|
||||
vcpkg_cmake_config_fixup()
|
||||
|
||||
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
|
||||
)
|
||||
else()
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/gRPCTargets-vcpkg-tools.cmake" "${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-vcpkg-tools.cmake" @ONLY)
|
||||
endif()
|
||||
|
||||
# Ignore the C# extension DLL in bin/
|
||||
SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
|
||||
12
externals/vcpkg/ports/grpc/snprintf.patch
vendored
Executable file
12
externals/vcpkg/ports/grpc/snprintf.patch
vendored
Executable file
@@ -0,0 +1,12 @@
|
||||
diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc
|
||||
index b761224..88a3d6b 100644
|
||||
--- a/src/core/tsi/alts/crypt/aes_gcm.cc
|
||||
+++ b/src/core/tsi/alts/crypt/aes_gcm.cc
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <grpc/support/port_platform.h>
|
||||
|
||||
#include <string.h>
|
||||
+#include <cstdio>
|
||||
|
||||
#include <openssl/bio.h>
|
||||
#include <openssl/buffer.h>
|
||||
2
externals/vcpkg/ports/grpc/vcpkg-cmake-wrapper.cmake
vendored
Executable file
2
externals/vcpkg/ports/grpc/vcpkg-cmake-wrapper.cmake
vendored
Executable file
@@ -0,0 +1,2 @@
|
||||
list(REMOVE_AT ARGS 0)
|
||||
_find_package(gRPC ${ARGS}) # Shouldn't this be fixed downstream instead of using a Wrapper?
|
||||
47
externals/vcpkg/ports/grpc/vcpkg.json
vendored
Executable file
47
externals/vcpkg/ports/grpc/vcpkg.json
vendored
Executable file
@@ -0,0 +1,47 @@
|
||||
{
|
||||
"name": "grpc",
|
||||
"version-semver": "1.44.0",
|
||||
"port-version": 1,
|
||||
"description": "An RPC library and framework",
|
||||
"homepage": "https://github.com/grpc/grpc",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": [
|
||||
"abseil",
|
||||
{
|
||||
"name": "c-ares",
|
||||
"platform": "!uwp"
|
||||
},
|
||||
{
|
||||
"name": "grpc",
|
||||
"host": true,
|
||||
"features": [
|
||||
"codegen"
|
||||
]
|
||||
},
|
||||
"openssl",
|
||||
"protobuf",
|
||||
{
|
||||
"name": "protobuf",
|
||||
"host": true
|
||||
},
|
||||
"re2",
|
||||
"upb",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"zlib"
|
||||
],
|
||||
"features": {
|
||||
"absl-sync": {
|
||||
"description": "Use abseil synchronization module"
|
||||
},
|
||||
"codegen": {
|
||||
"description": "Build code generator machinery"
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user