travis: Fix the cargotest bot #38472
Merged
Conversation
This file contains 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
Recently the Cargo revision running on cargotest was updated in rust-lang#38051, and the updated version of Cargo pulls in the openssl-sys 0.9 crate instead of the old openssl-sys 0.7 crate. The 0.9 release of openssl-sys has slightly different requirements and logic for detecting OpenSSL, namely it requires `pkg-config` to be present on Linux typically. This commit fixes this problem by installing pkg-config in the cargotest container that's running on the bots. This in turn should hopefully fix the build script and allow it to find the already-installed local OpenSSL libraries.
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ |
|
📌 Commit 488359e has been approved by |
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Dec 20, 2016
travis: Fix the cargotest bot Recently the Cargo revision running on cargotest was updated in rust-lang#38051, and the updated version of Cargo pulls in the openssl-sys 0.9 crate instead of the old openssl-sys 0.7 crate. The 0.9 release of openssl-sys has slightly different requirements and logic for detecting OpenSSL, namely it requires `pkg-config` to be present on Linux typically. This commit fixes this problem by installing pkg-config in the cargotest container that's running on the bots. This in turn should hopefully fix the build script and allow it to find the already-installed local OpenSSL libraries.
bors
added a commit
that referenced
this pull request
Dec 20, 2016
Rollup of 29 pull requests - Successful merges: #37761, #38006, #38131, #38150, #38158, #38171, #38208, #38215, #38236, #38245, #38289, #38302, #38315, #38346, #38388, #38395, #38398, #38418, #38432, #38451, #38463, #38468, #38470, #38471, #38472, #38478, #38486, #38493, #38498 - Failed merges: #38271, #38483
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.
Recently the Cargo revision running on cargotest was updated in #38051, and the
updated version of Cargo pulls in the openssl-sys 0.9 crate instead of the old
openssl-sys 0.7 crate. The 0.9 release of openssl-sys has slightly different
requirements and logic for detecting OpenSSL, namely it requires
pkg-configtobe present on Linux typically.
This commit fixes this problem by installing pkg-config in the cargotest
container that's running on the bots. This in turn should hopefully fix the
build script and allow it to find the already-installed local OpenSSL libraries.