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.

Sign up for GitHub

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

Jump to bottom

Upgrade liblibc to upstream version 0.2.35. #47248

Merged
merged 2 commits into from
Jan 10, 2018
Merged

Upgrade liblibc to upstream version 0.2.35. #47248

merged 2 commits into from
Jan 10, 2018

Conversation

EdSchouten
Copy link
Contributor

This version of liblibc is a prerequisite for getting libstd to build on
CloudABI.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 7, 2018
@kennytm
Copy link
Member

kennytm commented Jan 7, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Jan 7, 2018

📌 Commit 2f83f05 has been approved by kennytm

@EdSchouten
Copy link
Contributor Author

Ah, we need to update this in two places: both the src/liblibc and the dependency on 0.2.34 in Cargo.lock. PTAL!

@bors
Copy link
Contributor

bors commented Jan 7, 2018

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

@EdSchouten
Copy link
Contributor Author

It looks like I now need one more change in liblibc that still has to be merged:

rust-lang/libc#889

Let temporarily put this pull request on pause until that change of mine has been merged...

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 8, 2018
@EdSchouten
Upgrade liblibc to latest upstream version.
80cfcdf 
This version of liblibc is a prerequisite for getting libstd to build on
CloudABI.
@EdSchouten
Update to libc in Cargo.lock to 0.2.35 as well.
ee04aac
@EdSchouten
Copy link
Contributor Author

And we're good to go! The pull request got merged and I just updated the commits in this one.

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jan 8, 2018
@kennytm
Copy link
Member

kennytm commented Jan 8, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Jan 8, 2018

📌 Commit ee04aac 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 8, 2018
@kennytm kennytm mentioned this pull request Jan 8, 2018
Merged
bors added a commit that referenced this pull request Jan 9, 2018
@bors
Auto merge of #47276 - kennytm:rollup, r=kennytm
74966b5 
Rollup of 10 pull requests

- Successful merges: #47210, #47233, #47246, #47254, #47256, #47258, #47259, #47263, #47270, #47272
- Failed merges: #47248
@kennytm
Copy link
Member

kennytm commented Jan 9, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Jan 9, 2018

📌 Commit ee04aac has been approved by kennytm

@bors
Copy link
Contributor

bors commented Jan 10, 2018

⌛ Testing commit ee04aac with merge 107e65e...

bors added a commit that referenced this pull request Jan 10, 2018
@bors
Auto merge of #47248 - EdSchouten:cloudabi-liblibc, r=kennytm
107e65e 
Upgrade liblibc to upstream version 0.2.35.

This version of liblibc is a prerequisite for getting libstd to build on
CloudABI.
@bors
Copy link
Contributor

bors commented Jan 10, 2018

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

@bors bors merged commit ee04aac into rust-lang:master Jan 10, 2018
This was referenced Jan 10, 2018
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@EdSchouten @rust-highfive @kennytm @bors @nikomatsakis