-
Notifications
You must be signed in to change notification settings - Fork 954
Fix pkgconfig for openssl build #1054
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
@malbarbo Thanks, this looks important to fix ASAP However, modifying pkgconfig directly with a regex seems a bit brittle, and if it breaks, we won't realise until too late. What do you think of the following:
|
d848917
to
1b24154
Compare
1b24154
to
3eff003
Compare
Docker was using the cached openssl build... Let's see how it goes now. |
3eff003
to
74b310a
Compare
@Diggsey travis is green now. |
@brson Considering that this is an important fix, you may be interest. |
Fwiw a revert of #1028 would also be a reasonable option as a quick fix (it's strictly an optimization - when it works - so the only hit would be build time). |
This is the test suggested by @malbarbo in his PR: rust-lang#1054
74b310a
to
32603d3
Compare
Closing in favor of #1065; |
Fix OpenSSL linkage by using the final install-directory in the build This PR addresses #1051 by avoiding moving OpenSSL's install-target directory after it's been configured. It also encorporates the regression test suggested by @malbarbo on #1054. It still makes sense to move directories about to avoid getting a partially-built copy of openssl, and I think it makes sense to cache the finished product rather than the src/build directory. I haven't been able to test the output on one of the affected platforms (although the check on symbols passes) as I don't know a good way to get artefacts out of the travis build.
To avoid cache problems #1028 uses a temporary install directory for openssl. When the openssl install is completed the install dir is renamed. In doing so the pkgconfig files become invalid and libcurl-sys fails to find openssl and is built without https support. This fix the pkgconfig files. Fixes #1051.