Skip to content

Commit 30079a2

Browse files
author
Paul Nienaber
committed
DX-90582: Force protobuf-3.x in vcpkg.json
Rev 3: Reinstate builtin-baseline to match https://github.com/Bit-Quill/arrow/blob/ccf812f46373c3830735e60a120a5dd8ad7b0eff/cpp/vcpkg.json (tip of https://github.com/Bit-Quill/arrow/blob/BQ-flight-jdbc-driver/cpp/vcpkg.json which is what the build job is currently configured to use by branch name) Rev 4: Change to 3.19.4 because vcpkg doesn't work as documented and cannot use a nonexistent version as a "version>=" lower bound. Rev 5: Change builtin-baseline to 642a803 (current vcpkg/master tip) as part of resolving build issues with e.g. boost-coroutine Rev 6: Correctly change vcpkg builtin-baseline to b2fd29fec759bf49fd40bfd633204200b115a2b5 Rev 7: Update vcpkg.json protobuf "version>=" to 3.21.8 Rev 8: FORCE protobuf-3.21.8 in vcpkg.json "overrides" Rev 9: Try using grpc-1.51.1#3 to eliminate dependency on protobuf-4.x Rev 10: Typo in vcpkg.json Rev 11: Also use overrides in vcpkg.conf for both grpc & protobuf Rev 12: Try adding override to upb-2022-06-21#1 to resolve grpc build failure Rev 13: Add xsimd to vcpkg.json as it is no longer a transitive dependency Rev 14: Force abseil 20220623.1#0 which presumably works with Arrow @ b050bd0d31db6412256cec3362c0d57c9732e1f2 Rev 15: Downgrade re2 for compatibility with older abseil Change-Id: I87512df360f4a76805ba08a9b8b242f48590fce6
1 parent 775956f commit 30079a2

File tree

1 file changed

+25
-2
lines changed

1 file changed

+25
-2
lines changed

vcpkg.json

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,36 @@
1717
"brotli",
1818
"gflags",
1919
"openssl",
20-
"protobuf",
20+
{
21+
"$explanation": [
22+
"Arrow is not compatible with protobuf-4.x+",
23+
"Dependencies are least-sufficient-version so as",
24+
"long as 3.x is in-tree this should work"
25+
],
26+
"name": "protobuf",
27+
"version>=": "3.21.8"
28+
},
2129
"rapidjson",
2230
"zlib",
2331
"re2",
24-
"grpc",
32+
{
33+
"$explanation": [
34+
"Downgrade to grpc still compatible with/requiring protobuf-3.x"
35+
],
36+
"name": "grpc",
37+
"version>=": "1.51.1#3"
38+
},
2539
"utf8proc",
40+
"xsimd",
2641
"zlib",
2742
"zstd"
43+
],
44+
"builtin-baseline": "b2fd29fec759bf49fd40bfd633204200b115a2b5",
45+
"overrides": [
46+
{ "name": "abseil", "version": "20220623.1#0" },
47+
{ "name": "grpc", "version": "1.51.1#3" },
48+
{ "name": "protobuf", "version": "3.21.8" },
49+
{ "name": "re2", "version": "2021-11-01#1" },
50+
{ "name": "upb", "version": "2022-06-21#1" }
2851
]
2952
}

0 commit comments

Comments
 (0)