Skip to content

Update some *-sys dependencies of Cargo/RLS#54301

Merged
bors merged 1 commit intorust-lang:masterfrom
alexcrichton:update-curl
Sep 20, 2018
Merged

Update some *-sys dependencies of Cargo/RLS#54301
bors merged 1 commit intorust-lang:masterfrom
alexcrichton:update-curl

Conversation

@alexcrichton
Copy link
Copy Markdown
Member

@alexcrichton alexcrichton commented Sep 17, 2018

This is intended to help solve #54206 on nightly where the RLS on MinGW is
having build issues with accidentally building a curl library which links to
pthread symbols on Windows (where it should use native mutex locking instead).
The build system for these *-sys crates have all been rewritten to be based on
cc to bypass native build systems and platform detection to make sure we
configure them correctly.

@rust-highfive
Copy link
Copy Markdown
Contributor

rust-highfive commented Sep 17, 2018

r? @aturon

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 17, 2018
@alexcrichton alexcrichton mentioned this pull request Sep 17, 2018
Closed
@alexcrichton
Copy link
Copy Markdown
Member Author

alexcrichton commented Sep 17, 2018

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Copy Markdown
Member

Mark-Simulacrum commented Sep 18, 2018

@bors r+

@bors
Copy link
Copy Markdown
Collaborator

bors commented Sep 18, 2018

📌 Commit 5c55ba47787e5728de25964690f13750fc814ca0 has been approved by Mark-Simulacrum

@bors bors 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 Sep 18, 2018
@alexcrichton
Copy link
Copy Markdown
Member Author

alexcrichton commented Sep 19, 2018

@bors: p=1

Looking to see if this fixes the MinGW rls regression

@bors
Copy link
Copy Markdown
Collaborator

bors commented Sep 20, 2018

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout update-curl (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self update-curl --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
warning: Cannot merge binary files: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 20, 2018
@alexcrichton
Update some *-sys dependencies of Cargo/RLS
b1305c2 
This is intended to help solve rust-lang#54206 on nightly where the RLS on MinGW is
having build issues with accidentally building a `curl` library which links to
pthread symbols on Windows (where it should use native mutex locking instead).
The build system for these `*-sys` crates have all been rewritten to be based on
`cc` to bypass native build systems and platform detection to make sure we
configure them correctly.
@alexcrichton
Copy link
Copy Markdown
Member Author

alexcrichton commented Sep 20, 2018

@bors: r=Mark-Simulacrum

@bors
Copy link
Copy Markdown
Collaborator

bors commented Sep 20, 2018

📌 Commit b1305c2 has been approved by Mark-Simulacrum

@bors bors 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 Sep 20, 2018
@bors
Copy link
Copy Markdown
Collaborator

bors commented Sep 20, 2018

⌛ Testing commit b1305c2 with merge d16f27f...

bors added a commit that referenced this pull request Sep 20, 2018
@bors
Auto merge of #54301 - alexcrichton:update-curl, r=Mark-Simulacrum
d16f27f 
Update some `*-sys` dependencies of Cargo/RLS

This is intended to help solve #54206 on nightly where the RLS on MinGW is
having build issues with accidentally building a `curl` library which links to
pthread symbols on Windows (where it should use native mutex locking instead).
The build system for these `*-sys` crates have all been rewritten to be based on
`cc` to bypass native build systems and platform detection to make sure we
configure them correctly.
@bors
Copy link
Copy Markdown
Collaborator

bors commented Sep 20, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing d16f27f to master...

@bors bors merged commit b1305c2 into rust-lang:master Sep 20, 2018
@bors bors mentioned this pull request Sep 20, 2018
Closed
@alexcrichton alexcrichton deleted the update-curl branch September 20, 2018 16:27
@alexcrichton alexcrichton added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Sep 20, 2018
@alexcrichton alexcrichton mentioned this pull request Sep 20, 2018
Merged
@emilyalbini emilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 20, 2018
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 20, 2018
@alexcrichton
[beta] Update some *-sys dependencies of Cargo/RLS
9072003 
This is a backport of rust-lang#54301 to the beta branch
bors added a commit that referenced this pull request Sep 21, 2018
@bors
Auto merge of #54396 - alexcrichton:beta-next, r=Mark-Simulacrum
27ae525 
[beta] Update some `*-sys` dependencies of Cargo/RLS

This is a backport of #54301 to the beta branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. 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.

6 participants

@alexcrichton @rust-highfive @Mark-Simulacrum @bors @aturon @emilyalbini