Skip to content

fix(shm): drop cfg_aliases macro, hand-roll build.rs cfg logic #2680

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.

Sign up for GitHub

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

Merged
YuanYuYuan merged 3 commits into from
Jul 16, 2026
+23 −34
Merged

fix(shm): drop cfg_aliases macro, hand-roll build.rs cfg logic #2680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4db3887
fix(shm): drop cfg_aliases macro, hand-roll build.rs cfg logic
YuanYuYuan Jul 16, 2026
8f2b9aa
fix(shm): drop cfg_aliases dependency entirely
YuanYuYuan Jul 16, 2026
93d122a
style(shm): satisfy rustfmt on build.rs match-pattern wrapping
YuanYuYuan Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions commons/zenoh-shm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,3 @@ winapi = { workspace = true }

[dev-dependencies]
libc = { workspace = true }

[build-dependencies]
cfg_aliases = "0.2.1"
54 changes: 23 additions & 31 deletions commons/zenoh-shm/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,30 @@
// ZettaScale Zenoh Team, <zenoh@zettascale.tech>
//

use cfg_aliases::cfg_aliases;

fn main() {
// these aliases should at least be included in the same aliases of Nix crate:
// ___________________
// | |
// | Nix aliases |
// | ___________ |
// | | Our | |
// | | aliases | |
// | |_________| |
// |_________________|
cfg_aliases! {
dragonfly: { target_os = "dragonfly" },
ios: { target_os = "ios" },
freebsd: { target_os = "freebsd" },
macos: { target_os = "macos" },
netbsd: { target_os = "netbsd" },
openbsd: { target_os = "openbsd" },
watchos: { target_os = "watchos" },
tvos: { target_os = "tvos" },
visionos: { target_os = "visionos" },

apple_targets: { any(ios, macos, watchos, tvos, visionos) },
bsd: { any(freebsd, dragonfly, netbsd, openbsd, apple_targets) },
// `shm_external_lockfile` is the only cfg alias this crate actually
// queries (see src/posix_shm/cleanup.rs, src/shm/unix.rs) -- it marks
// platforms that don't support advisory file locking on tmpfs: the BSD
// family (including all Apple targets, which are BSD-derived) plus
// Redox. Computed directly instead of pulling in the `cfg_aliases`
// crate for a single derived flag.
let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();

@fuzzypixelz fuzzypixelz Jul 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@YuanYuYuan this is a fair comment, even if CARGO_CFG_TARGET_OS should be present.

@YuanYuYuan YuanYuYuan Jul 16, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sorry, I missed this since it doesn't show up in the GitHub mobile app. I will address it.

let shm_external_lockfile = matches!(
target_os.as_str(),
"freebsd"
| "dragonfly"
| "netbsd"
| "openbsd"
| "ios"
| "macos"
| "watchos"
| "tvos"
| "visionos"
| "redox"
);

// we use this alias to detect platforms that
// don't support advisory file locking on tmpfs
shm_external_lockfile: { any(bsd, target_os = "redox") },
}

println!("cargo:rustc-check-cfg=cfg(apple_targets)");
println!("cargo:rustc-check-cfg=cfg(bsd)");
println!("cargo:rustc-check-cfg=cfg(shm_external_lockfile)");
if shm_external_lockfile {
println!("cargo:rustc-cfg=shm_external_lockfile");
}
}
Loading