afc0d4d4af
Brings in upstream7c4dbc2(call with multiple fds),a2110bb(verify flags in call_{ro,wo}) anddf6ecd9(0.1.19) on top of the fork, instead of replacing the fork with upstream. The stray bump-0.1.19 branch took the wholesale-replacement route and silently dropped committed Red Bear work: the redox_syscall-gated 'pub mod acpi' re-export of AcpiVerb, F_DUPFD_CLOEXEC, the vasilito authors entry required by local/AGENTS.md 'Fork authorship attribution', and the gitea.redbearos.org repository URL required by the Single-Repo Rule. That is the failure mode local/AGENTS.md documents for the deprecated bump-fork.sh. Merging preserves all of it. # Conflicts: # Cargo.toml # src/lib.rs
39 lines
1.4 KiB
TOML
39 lines
1.4 KiB
TOML
[package]
|
|
name = "libredox"
|
|
authors = ["4lDO2 <4lDO2@protonmail.com>", "vasilito <adminpupkin@gmail.com>"]
|
|
version = "0.1.19+rb0.3.2"
|
|
edition = "2021"
|
|
license = "MIT"
|
|
description = "Redox stable ABI"
|
|
repository = "https://gitea.redbearos.org/vasilito/RedBear-OS"
|
|
exclude = ["target"]
|
|
|
|
[features]
|
|
default = ["base", "call", "std", "protocol", "redox_syscall"]
|
|
base = ["libc"]
|
|
call = ["base"]
|
|
std = ["base"]
|
|
protocol = ["plain", "bitflags"]
|
|
mkns = ["ioslice"]
|
|
# The `redox_syscall` feature activates the optional `redox_syscall`
|
|
# dep below. The `#[cfg(feature = "redox_syscall")]` attributes in
|
|
# src/lib.rs gate the `From` impls between `libredox::error::Error`
|
|
# and `syscall::Error`; without the feature, those impls are absent
|
|
# and `?` propagation between the two types fails. Mirroring
|
|
# upstream `libredox 0.1.19`'s feature structure.
|
|
redox_syscall = ["dep:redox_syscall"]
|
|
|
|
[dependencies]
|
|
bitflags = { version = "2", optional = true }
|
|
libc = { version = "0.2", optional = true }
|
|
# The redox_syscall package has [lib] name = "syscall", so
|
|
# in Rust code it is imported as `syscall`, NOT `redox_syscall`.
|
|
# This dep is optional and gated by the `redox_syscall` feature
|
|
# above. Matching upstream `libredox 0.1.18` structure.
|
|
redox_syscall = { path = "../syscall", optional = true }
|
|
ioslice = { version = "0.6", optional = true }
|
|
plain = { version = "0.2", optional = true }
|
|
|
|
[patch.crates-io]
|
|
redox_syscall = { path = "../syscall" }
|