Skip to content

Conversation

@tgross35
Copy link
Contributor

@tgross35 tgross35 commented Jan 6, 2026

Details are in the commit messages.

@tgross35 tgross35 force-pushed the fix-uclibc branch 3 times, most recently from d2b0007 to 402d74f Compare January 6, 2026 07:46
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Jan 6, 2026
Resolves a uclibc build error introduced in the "Fixes" commit.

Fixes: 2fe1d91 ("Separate L4Re from Linux code and enable tests")
Move netlink types defined in UAPI to the `new` module. This resolves
the following build error on uclibc platforms:

    error[E0425]: cannot find value `NLMSG_MIN_TYPE` in the crate root
        --> /home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.179/src/unix/linux_like/linux/mod.rs:1999:48
         |
    1999 | pub const NFNL_MSG_BATCH_BEGIN: c_int = crate::NLMSG_MIN_TYPE;
         |                                                ^^^^^^^^^^^^^^ not found in the crate root
         |
    note: found an item that was configured out
        --> /home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.179/src/unix/linux_like/linux_l4re_shared.rs:1222:19
         |
    1200 |     if #[cfg(not(target_env = "uclibc"))] {
         |                 ----------------------- the item is gated here
    ...
    1222 |         pub const NLMSG_MIN_TYPE: c_int = 0x10;
         |                   ^^^^^^^^^^^^^^

Fixes: 2fe1d91 ("Separate L4Re from Linux code and enable tests")
@rustbot
Copy link
Collaborator

rustbot commented Jan 6, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@tgross35 tgross35 force-pushed the fix-uclibc branch 3 times, most recently from 7e62817 to 394ebaf Compare January 6, 2026 08:04
@tgross35 tgross35 added this pull request to the merge queue Jan 6, 2026
Merged via the queue into rust-lang:main with commit 68d3a77 Jan 6, 2026
51 checks passed
@tgross35 tgross35 deleted the fix-uclibc branch January 6, 2026 10:35
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Jan 8, 2026
Resolves a uclibc build error introduced in the "Fixes" commit.

Fixes: 2fe1d91 ("Separate L4Re from Linux code and enable tests")

(backport <rust-lang#4915>)
(cherry picked from commit 3dad489)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Jan 8, 2026
Move netlink types defined in UAPI to the `new` module. This resolves
the following build error on uclibc platforms:

    error[E0425]: cannot find value `NLMSG_MIN_TYPE` in the crate root
        --> /home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.179/src/unix/linux_like/linux/mod.rs:1999:48
         |
    1999 | pub const NFNL_MSG_BATCH_BEGIN: c_int = crate::NLMSG_MIN_TYPE;
         |                                                ^^^^^^^^^^^^^^ not found in the crate root
         |
    note: found an item that was configured out
        --> /home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.179/src/unix/linux_like/linux_l4re_shared.rs:1222:19
         |
    1200 |     if #[cfg(not(target_env = "uclibc"))] {
         |                 ----------------------- the item is gated here
    ...
    1222 |         pub const NLMSG_MIN_TYPE: c_int = 0x10;
         |                   ^^^^^^^^^^^^^^

Fixes: 2fe1d91 ("Separate L4Re from Linux code and enable tests")

(backport <rust-lang#4915>)
(cherry picked from commit e0ed72d)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Jan 8, 2026
@tgross35 tgross35 mentioned this pull request Jan 8, 2026
github-merge-queue bot pushed a commit that referenced this pull request Jan 8, 2026
Resolves a uclibc build error introduced in the "Fixes" commit.

Fixes: 2fe1d91 ("Separate L4Re from Linux code and enable tests")

(backport <#4915>)
(cherry picked from commit 3dad489)
github-merge-queue bot pushed a commit that referenced this pull request Jan 8, 2026
Move netlink types defined in UAPI to the `new` module. This resolves
the following build error on uclibc platforms:

    error[E0425]: cannot find value `NLMSG_MIN_TYPE` in the crate root
        --> /home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.179/src/unix/linux_like/linux/mod.rs:1999:48
         |
    1999 | pub const NFNL_MSG_BATCH_BEGIN: c_int = crate::NLMSG_MIN_TYPE;
         |                                                ^^^^^^^^^^^^^^ not found in the crate root
         |
    note: found an item that was configured out
        --> /home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.179/src/unix/linux_like/linux_l4re_shared.rs:1222:19
         |
    1200 |     if #[cfg(not(target_env = "uclibc"))] {
         |                 ----------------------- the item is gated here
    ...
    1222 |         pub const NLMSG_MIN_TYPE: c_int = 0x10;
         |                   ^^^^^^^^^^^^^^

Fixes: 2fe1d91 ("Separate L4Re from Linux code and enable tests")

(backport <#4915>)
(cherry picked from commit e0ed72d)
github-merge-queue bot pushed a commit that referenced this pull request Jan 8, 2026
(backport <#4915>)
(cherry picked from commit 68d3a77)
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Jan 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-gnu O-linux O-unix stable-applied This PR has been cherry-picked to libc's stable release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants