Skip to content

Upgrade liblibc to upstream version 0.2.35. - #47248

Merged
bors merged 2 commits into
rust-lang:masterfrom
EdSchouten:cloudabi-liblibc
Jan 10, 2018
Merged

Upgrade liblibc to upstream version 0.2.35.#47248
bors merged 2 commits into
rust-lang:masterfrom
EdSchouten:cloudabi-liblibc

Conversation

@EdSchouten

@EdSchoutenEdSchouten commented Jan 7, 2018

Copy link
Copy Markdown
Contributor

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

@rust-highfive

rust-highfive commented Jan 7, 2018

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

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

kennytm commented Jan 7, 2018

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 7, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 2f83f05 has been approved by kennytm

@EdSchouten

EdSchouten commented Jan 7, 2018

Copy link
Copy Markdown
ContributorAuthor

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

bors commented Jan 7, 2018

Copy link
Copy Markdown
Collaborator

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

@EdSchouten

EdSchouten commented Jan 8, 2018

Copy link
Copy Markdown
ContributorAuthor

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...

@kennytmkennytm added S-blocked Status: 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

EdSchouten commented Jan 8, 2018

Copy link
Copy Markdown
ContributorAuthor

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

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

kennytm commented Jan 8, 2018

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 8, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit ee04aac has been approved by kennytm

@kennytmkennytm 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
@kennytmkennytm 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

kennytm commented Jan 9, 2018

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 9, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit ee04aac has been approved by kennytm

@bors

bors commented Jan 10, 2018

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Jan 10, 2018

Copy link
Copy Markdown
Collaborator

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

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

Reviewers

No reviews

Assignees

@nikomatsakisnikomatsakis

Labels

S-waiting-on-borsStatus: 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