Bump git2 dep to fix SSL paths #3342
Merged
Conversation
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
This commit includes alexcrichton/git2-rs@a8f4a7faa which switches the order of initialization of libgit2. That commit ensures that the relevant env vars which a statically linked OpenSSL needs to function are set before libgit2 is initialized to ensure that libgit2 uses them. This was regressed accidentally in alexcrichton/git2-rs@071902aa when initialization was tweaked. Closes rust-lang#3340
|
@bors: r+ |
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
📌 Commit 52fa741 has been approved by |
bors
added a commit
that referenced
this pull request
Nov 29, 2016
Bump git2 dep to fix SSL paths This commit includes alexcrichton/git2-rs@a8f4a7faa which switches the order of initialization of libgit2. That commit ensures that the relevant env vars which a statically linked OpenSSL needs to function are set before libgit2 is initialized to ensure that libgit2 uses them. This was regressed accidentally in alexcrichton/git2-rs@071902aa when initialization was tweaked. Closes #3340
|
☀️ Test successful - cargo-cross-linux, cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64 |
bors
added a commit
that referenced
this pull request
Dec 2, 2016
Backporting fixes to 1.14.0 This is a backport of the following PRs to fix the actual issue, rust-lang/rust#37969. * #3311 - first attempt to fix OpenSSL linkage on OSX * #3315 - second attempt to fix linkage * #3325 - fix a flaky test causing lots of CI problems * #3332 - actual fix for OpenSSL linkage on OSX * #3345 - first PR for automation changes * #3350 - second PR for automation changes * #3326 - update git2 to support netbsd * #3331 - update git2 to fix segfaults in tests * #3342 - update git2 to fix cert paths
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 commit includes alexcrichton/git2-rs@a8f4a7faa which switches the order of
initialization of libgit2. That commit ensures that the relevant env vars which
a statically linked OpenSSL needs to function are set before libgit2 is
initialized to ensure that libgit2 uses them.
This was regressed accidentally in alexcrichton/git2-rs@071902aa when
initialization was tweaked.
Closes #3340