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

Update Cargo and its dependencies #47280

Merged
merged 1 commit into from
Jan 18, 2018
Merged

Conversation

alexcrichton
Copy link
Member

This'll probably have a bunch of build errors, so let's try and head those off
and find them sooner rather than later!

@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@EdSchouten
Copy link
Contributor

Thanks for working on this! Including cc 1.0.4 is going to be pretty useful for me to get automated builds for CloudABI to work.

@kennytm kennytm added the S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. label Jan 9, 2018
@kennytm
Copy link
Member

kennytm commented Jan 9, 2018

[01:26:02] cargo/guide/index.html:103: broken link - cargo/guide/build-cache.html
[01:26:02] cargo/print.html:187: broken link - cargo/guide/build-cache.html

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jan 9, 2018
@alexcrichton
Copy link
Member Author

I think that should be fixed w/ rust-lang/cargo#4926 (and hopefully good to go afterwards)

@bors
Copy link
Contributor

bors commented Jan 10, 2018

☔ The latest upstream changes (presumably #47248) made this pull request unmergeable. Please resolve the merge conflicts.

@kennytm
Copy link
Member

kennytm commented Jan 10, 2018

Travis is green, so r=me after fixing the merge conflict (and let the actual debugging begin 😄).

@alexcrichton
Copy link
Member Author

@bors: r=kennytm

@bors
Copy link
Contributor

bors commented Jan 10, 2018

📌 Commit edebaa5 has been approved by kennytm

@bors
Copy link
Contributor

bors commented Jan 12, 2018

☔ The latest upstream changes (presumably #47392) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
Copy link
Member Author

@bors: r=kennytm

@bors
Copy link
Contributor

bors commented Jan 12, 2018

📌 Commit 43c4fe2 has been approved by kennytm

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 13, 2018
@kennytm
Copy link
Member

kennytm commented Jan 13, 2018

@bors p=1

@bors
Copy link
Contributor

bors commented Jan 13, 2018

⌛ Testing commit 43c4fe228cbb82b377ed34c71a09c376297b8c21 with merge 31a263c05d17d0cb7da5a1d2ceb7083cf7ef1c63...

@bors
Copy link
Contributor

bors commented Jan 13, 2018

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Jan 13, 2018

As expected

  = note: C:\projects\rust\build\x86_64-pc-windows-gnu\stage2-tools\x86_64-pc-windows-gnu\release\deps\liblibgit2_sys-8baa38816dcee9e8.rlib(socket_stream.c.obj):socket_stream.c:(.text$socket_connect+0x187): undefined reference to `gai_strerrorA'

@bors
Copy link
Contributor

bors commented Jan 16, 2018

📌 Commit 57c2f90 has been approved by kennytm

@bors
Copy link
Contributor

bors commented Jan 16, 2018

⌛ Testing commit 57c2f90e616c82d6dd4807332bf0efbc096f3226 with merge c0a65e0e9932bd2cb77c74c7be13d56fb0182593...

@bors
Copy link
Contributor

bors commented Jan 16, 2018

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Jan 16, 2018

Same error.

@retep998
Copy link
Member

It's building the things using stage0 and that stage doesn't yet have the fix of those two import libraries in the sysroot.

@kennytm
Copy link
Member

kennytm commented Jan 16, 2018

Ah. Could we build them using stage2? (If stage0 can't be fixed)

@Mark-Simulacrum
Copy link
Member

I would prefer that we don't move anything to later stages because stage 0 doesn't work; if this is a bug in stage 0, we can backport and bump the bootstrap compiler or workaround it temporarily, I think. However, if there's no other solution, moving to stage 2 compilation should be relatively painless.

@kennytm kennytm added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 16, 2018
@alexcrichton
Copy link
Member Author

I've confirmed that the master branch of winapi builds cleanly (no env vars set) with MinGW due to the use of prefixed libraries. Due to other bugs however we can't actually use [patch] to depend on git repositories (it fails distcheck), @retep998 would you be able to make a release soon?

@bors
Copy link
Contributor

bors commented Jan 17, 2018

☔ The latest upstream changes (presumably #47522) made this pull request unmergeable. Please resolve the merge conflicts.

@retep998
Copy link
Member

@alexcrichton You will still need to set one of those environment variables though in order to avoid issues with external projects that depend on rustc internal crates failing to link because they can't find winapi's prefixed libraries. I've published new versions now.

This'll probably have a bunch of build errors, so let's try and head those off
and find them sooner rather than later!
@alexcrichton
Copy link
Member Author

@bors: r=kennytm

@bors
Copy link
Contributor

bors commented Jan 18, 2018

📌 Commit 80d6ed2 has been approved by kennytm

@bors
Copy link
Contributor

bors commented Jan 18, 2018

⌛ Testing commit 80d6ed2 with merge 44afd76...

bors added a commit that referenced this pull request Jan 18, 2018
Update Cargo and its dependencies

This'll probably have a bunch of build errors, so let's try and head those off
and find them sooner rather than later!
@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jan 18, 2018
@bors
Copy link
Contributor

bors commented Jan 18, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 44afd76 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants