Skip to content

Commit

Permalink
DX-90582: Force protobuf-3.x in vcpkg.json
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Paul Nienaber committed Aug 22, 2024
1 parent 775956f commit 30079a2
Showing 1 changed file with 25 additions and 2 deletions.
27 changes: 25 additions & 2 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,36 @@
"brotli",
"gflags",
"openssl",
"protobuf",
{
"$explanation": [
"Arrow is not compatible with protobuf-4.x+",
"Dependencies are least-sufficient-version so as",
"long as 3.x is in-tree this should work"
],
"name": "protobuf",
"version>=": "3.21.8"
},
"rapidjson",
"zlib",
"re2",
"grpc",
{
"$explanation": [
"Downgrade to grpc still compatible with/requiring protobuf-3.x"
],
"name": "grpc",
"version>=": "1.51.1#3"
},
"utf8proc",
"xsimd",
"zlib",
"zstd"
],
"builtin-baseline": "b2fd29fec759bf49fd40bfd633204200b115a2b5",
"overrides": [
{ "name": "abseil", "version": "20220623.1#0" },
{ "name": "grpc", "version": "1.51.1#3" },
{ "name": "protobuf", "version": "3.21.8" },
{ "name": "re2", "version": "2021-11-01#1" },
{ "name": "upb", "version": "2022-06-21#1" }
]
}

0 comments on commit 30079a2

Please sign in to comment.