Skip to content
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

Fix OpenSSL linkage by using the final install-directory in the build #1065

Merged
merged 3 commits into from
Apr 15, 2017

Conversation

jelford
Copy link
Contributor

@jelford jelford commented Apr 14, 2017

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.

This causes linking failures on most platforms because the
pkg-configs are still pointing to the location specified in
prefix (as they should).

This should address rust-lang#1051 but I'll add a regression test in
the next commit
@malbarbo
Copy link
Contributor

@jelford I checked the test it it does not print the message when it fails. The script uses set -ex, so if grep fails the script will fail before executing if statement. I you find appropriated, you can update to:

# check that rustup-init was built with ssl support
# see https://github.com/rust-lang-nursery/rustup.rs/issues/1051
if ! (nm target/$TARGET/release/rustup-init | grep Curl_ssl_version &> /dev/null); then
  echo "Missing ssl support!!!!"
  exit 1
fi

@jelford
Copy link
Contributor Author

jelford commented Apr 14, 2017

Thanks @malbarbo , incorporated your change.

@ghost
Copy link

ghost commented Apr 14, 2017

We want this!!!

@Diggsey
Copy link
Contributor

Diggsey commented Apr 15, 2017

@bors r
Thanks @jelford and @malbarbo, this looks great.

I can't make a release unfortunately, that'll have to wait until @brson is around.

@bors
Copy link
Contributor

bors commented Apr 15, 2017

📌 Commit 3b7ada1 has been approved by Diggsey

@bors
Copy link
Contributor

bors commented Apr 15, 2017

⌛ Testing commit 3b7ada1 with merge eb2896b...

bors added a commit that referenced this pull request Apr 15, 2017
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.
@bors
Copy link
Contributor

bors commented Apr 15, 2017

💔 Test failed - status-appveyor

@Diggsey Diggsey merged commit 8cb95b8 into rust-lang:master Apr 15, 2017
@alexreg
Copy link

alexreg commented Apr 24, 2017

Could we get this merged soon, hopefully? It's quite annoying not to be able to update, right now.

@jelford jelford deleted the fix_caching branch April 25, 2017 06:35
@jelford
Copy link
Contributor Author

jelford commented Apr 28, 2017

@Diggsey this is going to start to get more urgent with 1.17 shipping. Any timeline on when we might be able to get something pushed out? Sorry to nag.

@Diggsey
Copy link
Contributor

Diggsey commented Apr 28, 2017

@jelford There's nothing I can do about it unfortunately. @brson is aware of the issue and is going to make a new release ASAP, but he's been away and I imagine has had a ton of stuff to catch up on since getting back.

@jelford
Copy link
Contributor Author

jelford commented Apr 28, 2017 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants