Add a feature to build a vendored OpenSSL#5865
Merged
bors merged 1 commit intorust-lang:masterfrom Aug 5, 2018
Merged
Conversation
This will be enabled through rust-lang/rust to ensure that for dist builds we can build a Cargo with a vendored OpenSSL
|
r? @matklad (rust_highfive has picked a reviewer for you, use r? to override) |
Contributor
|
@bors r+ |
Contributor
|
📌 Commit 585c7d4 has been approved by |
Contributor
bors
added a commit
that referenced
this pull request
Aug 5, 2018
Add a feature to build a vendored OpenSSL This will be enabled through rust-lang/rust to ensure that for dist builds we can build a Cargo with a vendored OpenSSL
Contributor
|
☀️ Test successful - status-appveyor, status-travis |
sfackler
reviewed
Aug 5, 2018
| url = "1.1" | ||
| clap = "2.31.2" | ||
| unicode-width = "0.1.5" | ||
| openssl = { version = '0.10.11', optional = true } |
Member
There was a problem hiding this comment.
Does cargo currently pull in openssl itself, or just openssl-sys? You can depend on openssl-sys 0.9.35 and use its vendored feature alternatively.
Member
Author
There was a problem hiding this comment.
Looks like Cargo depends on crypto-hash which depends on openssl-the-crate, although openssl-sys is less likely to change over time so it may be best to depend on that anyway
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Aug 15, 2018
Update cargo - Update transitioning url (rust-lang/cargo#5889) - Resolve some clippy lint warnings (rust-lang/cargo#5884) - Don't kill child processes on normal exit on Windows (rust-lang/cargo#5887) - fix a bunch of clippy warnings (rust-lang/cargo#5876) - Add support for rustc's --error-format short (rust-lang/cargo#5879) - Support JSON with rustdoc. (rust-lang/cargo#5878) - Fix rustfmt instructions in CONTRIBUTING.md (rust-lang/cargo#5880) - Allow `cargo run` in workspaces. (rust-lang/cargo#5877) - Change target filters in workspaces. (rust-lang/cargo#5873) - Improve verbose console and log for finding git repo in package check (rust-lang/cargo#5858) - Meta rename (rust-lang/cargo#5871) - fetch: skip target tests when cross_compile is disabled (rust-lang/cargo#5870) - Fully capture rustc and rustdoc output when -Zcompile-progress is passed (rust-lang/cargo#5862) - Fix test --example docs. (rust-lang/cargo#5867) - Add a feature to build a vendored OpenSSL (rust-lang/cargo#5865)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This will be enabled through rust-lang/rust to ensure that for dist builds we
can build a Cargo with a vendored OpenSSL