[0.2] Backports #4315
Merged
[0.2] Backports #4315
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@tgross35: no appropriate reviewer found, use |
rustbot
added
A-CI
While here: - Relocate mkostemp and mkostemps functions for same reason - Update semver tests for DF spawn and mkostemp(s) (backport <rust-lang#4294>) [ update constants to c_int to match libc-0.2 - Trevor ] (cherry picked from commit a294be6)
Base libc crate symbols without named syscall stubbing in this crate. Basic `libc-test` support is included, but the target is currently untested (backport <rust-lang#4244>) (cherry picked from commit 1b8acf5)
Remove the comment of these socket options. Reference: https://elixir.bootlin.com/linux/latest/source/include/uapi/asm-generic/socket.h Note, musl hardcodes 'SO_*' constants instead of inheriting them from the OS. Signed-off-by: Pedro Tammela <[email protected]> (backport <rust-lang#3917>) (cherry picked from commit b3884fb)
Hopefully this will help some of the recent CI issues. (backport <rust-lang#4306>) (cherry picked from commit 8efcf7b)
(backport <rust-lang#4301>) (cherry picked from commit a4fd45e)
Co-authored-by: Ookiineko <[email protected]> (backport <rust-lang#4279>) (cherry picked from commit f5569b1)
With the latest changes, libstd no longer builds: ``` Compiling libc v0.2.170 (/opt/Xous/libc) error[E0412]: cannot find type `c_int` in this scope --> /opt/Xous/libc/src/xous.rs:17:20 | 17 | pub const INT_MIN: c_int = -2147483648; | ^^^^^ not found in this scope | help: consider importing one of these type aliases | 5 + use crate::c_int; | 5 + use rustc_std_workspace_core::ffi::c_int; | error[E0412]: cannot find type `c_int` in this scope --> /opt/Xous/libc/src/xous.rs:18:20 | 18 | pub const INT_MAX: c_int = 2147483647; | ^^^^^ not found in this scope | help: consider importing one of these type aliases | 5 + use crate::c_int; | 5 + use rustc_std_workspace_core::ffi::c_int; | For more information about this error, try `rustc --explain E0412`. error: could not compile `libc` (lib) due to 2 previous errors ``` Include the prelude to define `c_int` and fix the build on rust `main`. Signed-off-by: Sean Cross <[email protected]> (backport <rust-lang#4304>) (cherry picked from commit fd66a07)
(backport <rust-lang#4308>) [ update message to mention Cygwin - Trevor ] (cherry picked from commit cd4be97)
(backport <rust-lang#4308>) [ update message to mention Cygwin - Trevor ] (cherry picked from commit e5f9b4e)
* `forkpty` & `openpty`: for nix::pty * `getgrgid_r`, `getgrouplist`, getgrnam_r`, `initgroups`: for `user` feature of `nix::unistd` (backport <rust-lang#4309>) [ update message to mention Cygwin - Trevor ] (cherry picked from commit 3dd7092)
tgross35
force-pushed
the
backport-porcini
branch
from
75df6d3 to
5726b3c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport the following:
wasm32-wali#4244--no-self-updatetorustup update#4306Based on #4314