Skip to content

Commit

Permalink
Fix CI for FreeBSD 15, on libc-0.2 branch
Browse files Browse the repository at this point in the history
It was failing for two reasons:

* 87fbd9fc71[^1] removed the TCP_MAXPEAKRATE symbol.
* 3458bbd392[^2] changed the value of RLIM_NLIMITS

This is effectively a merge of rust-lang#3950 (commit 590d78d) from the main
branch.

Fixes rust-lang#3947

[^1]: freebsd/freebsd-src@87fbd9f
[^2]: freebsd/freebsd-src@3458bbd
  • Loading branch information
asomers committed Sep 29, 2024
1 parent b9e8477 commit 07104b3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
8 changes: 7 additions & 1 deletion libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2338,6 +2338,9 @@ fn test_freebsd(target: &str) {
// base system anyway.
"CTL_MAXID" | "KERN_MAXID" | "HW_MAXID" | "USER_MAXID" => true,

// Deprecated and removed in FreeBSD 15. It was never actually implemented.
"TCP_MAXPEAKRATE" => true,

// FIXME: This is deprecated - remove in a couple of releases.
// This was removed in FreeBSD 14 (git 1b4701fe1e8) and never
// should've been used anywhere anyway.
Expand All @@ -2364,6 +2367,10 @@ fn test_freebsd(target: &str) {
| "PWAIT" | "PLOCK" | "PPAUSE" | "PRI_MIN_TIMESHARE" | "PUSER" | "PI_AV" | "PI_NET"
| "PI_DISK" | "PI_TTY" | "PI_DULL" | "PI_SOFT" => true,

// This constant changed in FreeBSD 15 (git 3458bbd397783). It was never intended to
// be stable, and probably shouldn't be bound by libc at all.
"RLIM_NLIMITS" => true,

// This symbol changed in FreeBSD 14 (git 051e7d78b03), but the new
// version should be safe to use on older releases.
"IFCAP_CANTCHANGE" => true,
Expand Down Expand Up @@ -2494,7 +2501,6 @@ fn test_freebsd(target: &str) {

// Flags introduced in FreeBSD 14.
"TCP_MAXUNACKTIME"
| "TCP_MAXPEAKRATE"
| "TCP_IDLE_REDUCE"
| "TCP_REMOTE_UDP_ENCAPS_PORT"
| "TCP_DELACK"
Expand Down
1 change: 1 addition & 0 deletions src/unix/bsd/freebsdlike/freebsd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3843,6 +3843,7 @@ pub const TCP_INFO: ::c_int = 32;
pub const TCP_CONGESTION: ::c_int = 64;
pub const TCP_CCALGOOPT: ::c_int = 65;
pub const TCP_MAXUNACKTIME: ::c_int = 68;
#[deprecated(since = "0.2.160", note = "Removed in FreeBSD 15")]
pub const TCP_MAXPEAKRATE: ::c_int = 69;
pub const TCP_IDLE_REDUCE: ::c_int = 70;
pub const TCP_REMOTE_UDP_ENCAPS_PORT: ::c_int = 71;
Expand Down

0 comments on commit 07104b3

Please sign in to comment.