diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-08-07 11:46:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 11:46:49 -0700 |
| commit | 95d3b86bca30da55dd0fe01da859ee362d7ff482 (patch) | |
| tree | 7cf3d7ba5871cfb908d5b642dfb5147bca75c1f6 | |
| parent | 3ca402bf5c4bacdc8e0fec159aa0707e03486b68 (diff) | |
| download | vcpkg-95d3b86bca30da55dd0fe01da859ee362d7ff482.tar.gz vcpkg-95d3b86bca30da55dd0fe01da859ee362d7ff482.zip | |
[grpc] Fix generate plugin grpc_csharp_ext (#12611)
| -rw-r--r-- | ports/grpc/00011-fix-csharp_plugin.patch | 33 | ||||
| -rw-r--r-- | ports/grpc/CONTROL | 1 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/ports/grpc/00011-fix-csharp_plugin.patch b/ports/grpc/00011-fix-csharp_plugin.patch new file mode 100644 index 000000000..c2d177113 --- /dev/null +++ b/ports/grpc/00011-fix-csharp_plugin.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77cf3de..8bceae6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1812,10 +1812,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}
+@@ -1829,6 +1833,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()
+
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index af06e82a4..f62df066c 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,5 +1,6 @@ Source: grpc Version: 1.29.1 +Port-Version: 1 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil 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 57fba090b..cc8fe92be 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( 00005-fix-uwp-error.patch 00009-use-system-upb.patch 00010-add-feature-absl-sync.patch + 00011-fix-csharp_plugin.patch snprintf.patch ) |