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

Bump libc dependency of std to 0.2.88. #82731

Merged
merged 1 commit into from
Mar 9, 2021

Conversation

de-vri-es
Copy link
Contributor

@de-vri-es de-vri-es commented Mar 3, 2021

This PR bumps the libc dependency of std to 0.2.88. This will fix TcpListener::accept for Android on x86 platforms (rust-lang/libc@31a2777).

This will really finally fix #82400 for the main branch :)

r? @JohnTitor

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 3, 2021
@rust-log-analyzer

This comment has been minimized.

@de-vri-es
Copy link
Contributor Author

Hmm, the test failure seems unrelated:

 extracting /checkout/obj/build/cache/2021-01-28/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz
    Updating crates.io index
error: failed to write /checkout/Cargo.lock

@de-vri-es de-vri-es force-pushed the bump-libc-for-std branch from 385b2a9 to b8c43db Compare March 3, 2021 19:47
Copy link
Member

@JohnTitor JohnTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should also update Cargo.lock but otherwise LGTM (example commit: c3dedd0).

@rust-log-analyzer

This comment has been minimized.

@de-vri-es de-vri-es force-pushed the bump-libc-for-std branch from b8c43db to 3d0916d Compare March 3, 2021 19:59
@de-vri-es
Copy link
Contributor Author

You should also update Cargo.lock but otherwise LGTM.

Right, forgot about that. Added it now.

@JohnTitor
Copy link
Member

r? @Mark-Simulacrum for final review.

@JohnTitor
Copy link
Member

libc v0.2.88 is released, @de-vri-es we should use the new version here.

@de-vri-es
Copy link
Contributor Author

Yep, definitely. Updated it now. Thanks for the quick libc release :]

@de-vri-es de-vri-es force-pushed the bump-libc-for-std branch from 3d0916d to c946d1d Compare March 5, 2021 19:54
@JohnTitor JohnTitor changed the title Bump libc dependency of std to 0.2.87. Bump libc dependency of std to 0.2.88. Mar 5, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Mar 7, 2021

📌 Commit c946d1d 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 Mar 7, 2021
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Mar 9, 2021
…-Simulacrum

Bump libc dependency of std to 0.2.88.

This PR bumps the `libc` dependency of `std` to 0.2.88. This will fix `TcpListener::accept` for Android on x86 platforms (rust-lang/libc@31a2777).

This will really finally fix rust-lang#82400 for the main branch :)

r? `@JohnTitor`
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 9, 2021
Rollup of 8 pull requests

Successful merges:

 - rust-lang#81127 (Improve sift_down performance in BinaryHeap)
 - rust-lang#81879 (Added #[repr(transparent)] to core::cmp::Reverse)
 - rust-lang#82048 (or-patterns: disallow in `let` bindings)
 - rust-lang#82731 (Bump libc dependency of std to 0.2.88.)
 - rust-lang#82799 (Add regression test for rust-lang#75525)
 - rust-lang#82841 (Change x64 size checks to not apply to x32.)
 - rust-lang#82883 (Update Cargo)
 - rust-lang#82887 (Update CONTRIBUTING.md)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ba63a84 into rust-lang:master Mar 9, 2021
@rustbot rustbot added this to the 1.52.0 milestone Mar 9, 2021
bors added a commit to rust-lang/libc that referenced this pull request Apr 29, 2021
Don't unconditionally link libiconv on macOS.

This adds `#[link(name = "iconv")]` to just the iconv symbols so that the
library is only linked if the symbols are used.

#2037 added a build.rs directive to always link libiconv on Apple platforms,
but that shouldn't be necessary. With this change, we can see using `otool -L`
that a binary that uses an `iconv` symbol links libiconv, but other binaries
don't.

Note that this can only be seen with a rustc prior to nightly-2021-03-09, as
nightly-2021-03-10 includes rust-lang/rust#82731 which
includes #2037, therefore unconditionally linking all Rust binaries to
libiconv.
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.

Accepting Incoming TCP Connections fails on Android
7 participants