Skip to content

Commit 9e6aab1

Browse files
authored
[grpc] fix upb library order in pkgconfig (#26752)
1 parent 274e8be commit 9e6aab1

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

Diff for: ports/grpc/00014-pkgconfig-upbdefs.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ index 25990a5d8a..4c7831cba5 100644
77
"${gRPC_CORE_VERSION}"
88
"gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant"
99
- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
10-
+ "-lgrpc -laddress_sorting -lre2 -ldescriptor_upb_proto -lupb_fastdecode -lupb_json -lupb_reflection -lupb_textformat -lupb_utf8_range -lupb -lcares -lz"
10+
+ "-lgrpc -laddress_sorting -lre2 -lupb_json -lupb_textformat -lupb_reflection -lupb -lupb_fastdecode -lupb_utf8_range -ldescriptor_upb_proto -lcares -lz"
1111
""
1212
"grpc.pc")
1313

Diff for: ports/grpc/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "grpc",
33
"version-semver": "1.48.0",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "An RPC library and framework",
66
"homepage": "https://github.com/grpc/grpc",
77
"license": "Apache-2.0",

Diff for: versions/baseline.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2734,7 +2734,7 @@
27342734
},
27352735
"grpc": {
27362736
"baseline": "1.48.0",
2737-
"port-version": 1
2737+
"port-version": 2
27382738
},
27392739
"grppi": {
27402740
"baseline": "0.4.0",

Diff for: versions/g-/grpc.json

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "efed7f493dec5fdebaebdec83c521fc860b432a3",
5+
"version-semver": "1.48.0",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "7b2206a9758481b4773a93435aa6cfe7de4bf9e5",
510
"version-semver": "1.48.0",

0 commit comments

Comments
 (0)