mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-05 00:11:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2ef1ac96a0
vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch

14 lines
697 B
Diff
Raw Normal View History

[grpc] fix generated pkg-config file (#19174) gRPC uses `upb`, but normally it vendors-in the dependency. The vendored-in version uses a single library artifact, and the generated pkg-config file simply adds `-lupb`. In `vcpkg` we use the `upb` package. This has more libraries, and thus more `-lupb_*` options are needed. Ideally we would use a `upb.pc` file, but that does not exist.
2021-07-28 06:29:44 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
[gRPC] update to v1.41.0 (#20835) * [gRPC] update to v1.41.0 * update version * [upb] Update to 2021-10-19 * Update pacth * [upb] Fix upstream bug * Replace depreciate functions * version * fix code * version * revert patch format * update version * Fix review advise * update version * Remove extra spaces * update version * update version * Remove space in patch file * change patch format from CRLF to CF * update version * revert patch format * update version * revert patch format * update version * Remove unnecessary additional * update version Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2021-11-12 03:34:39 +08:00
index f7d677c..d527ff4 100644
[grpc] fix generated pkg-config file (#19174) gRPC uses `upb`, but normally it vendors-in the dependency. The vendored-in version uses a single library artifact, and the generated pkg-config file simply adds `-lupb`. In `vcpkg` we use the `upb` package. This has more libraries, and thus more `-lupb_*` options are needed. Ideally we would use a `upb.pc` file, but that does not exist.
2021-07-28 06:29:44 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
[gRPC] update to v1.41.0 (#20835) * [gRPC] update to v1.41.0 * update version * [upb] Update to 2021-10-19 * Update pacth * [upb] Fix upstream bug * Replace depreciate functions * version * fix code * version * revert patch format * update version * Fix review advise * update version * Remove extra spaces * update version * update version * Remove space in patch file * change patch format from CRLF to CF * update version * revert patch format * update version * revert patch format * update version * Remove unnecessary additional * update version Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2021-11-12 03:34:39 +08:00
@@ -17705,7 +17705,7 @@ generate_pkgconfig(
[grpc] fix generated pkg-config file (#19174) gRPC uses `upb`, but normally it vendors-in the dependency. The vendored-in version uses a single library artifact, and the generated pkg-config file simply adds `-lupb`. In `vcpkg` we use the `upb` package. This has more libraries, and thus more `-lupb_*` options are needed. Ideally we would use a `upb.pc` file, but that does not exist.
2021-07-28 06:29:44 +08:00
"high performance general RPC framework"
"${gRPC_CORE_VERSION}"
[gRPC] update to v1.41.0 (#20835) * [gRPC] update to v1.41.0 * update version * [upb] Update to 2021-10-19 * Update pacth * [upb] Fix upstream bug * Replace depreciate functions * version * fix code * version * revert patch format * update version * Fix review advise * update version * Remove extra spaces * update version * update version * Remove space in patch file * change patch format from CRLF to CF * update version * revert patch format * update version * revert patch format * update version * Remove unnecessary additional * update version Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2021-11-12 03:34:39 +08:00
"gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time 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] fix generated pkg-config file (#19174) gRPC uses `upb`, but normally it vendors-in the dependency. The vendored-in version uses a single library artifact, and the generated pkg-config file simply adds `-lupb`. In `vcpkg` we use the `upb` package. This has more libraries, and thus more `-lupb_*` options are needed. Ideally we would use a `upb.pc` file, but that does not exist.
2021-07-28 06:29:44 +08:00
""
"grpc.pc")
Reference in New Issue Copy Permalink