vasilito
8a4014fb3c
The default features list still had 'redox_syscall' as a
feature entry, but the redox_syscall dep is now non-optional
(made non-optional in commit 80d0eae so the acpi module
could unconditionally re-export AcPiVerb). Cargo rejects
this as a manifest error: 'feature default includes
redox_syscall, but redox_syscall is not an optional
dependency'.
The fix is to remove 'redox_syscall' from the default list.
Since the dep is non-optional now, the feature is redundant
anyway (always on by default). The .orig and the
auto-generated Cargo.toml are updated in sync.
The previous build failure (after Cargo.toml regen) was
uncovered by the next build attempt and fixed here.
45 lines
1.7 KiB
TOML
45 lines
1.7 KiB
TOML
[package]
|
|
name = "libredox"
|
|
authors = ["4lDO2 <4lDO2@protonmail.com>"]
|
|
# Red Bear OS Phase J: version is 0.1.18 upstream. The
|
|
# redox_syscall dep is now required (not optional) because
|
|
# the local fork's acpi module (added in this commit) re-
|
|
# exports AcPiVerb from redox_syscall, and downstream recipes
|
|
# that don't enable the redox_syscall feature get an
|
|
# "unresolved import" error. Making the dep non-optional
|
|
# also matches the upstream 0.1.18 Cargo.toml pattern where
|
|
# the redox_syscall dep is unconditional.
|
|
version = "0.1.18"
|
|
edition = "2021"
|
|
license = "MIT"
|
|
description = "Redox stable ABI"
|
|
# Red Bear OS fork lives at the canonical outer repo
|
|
# (gitea.redbearos.org/vasilito/RedBear-OS).
|
|
repository = "https://gitea.redbearos.org/vasilito/RedBear-OS"
|
|
exclude = ["target"]
|
|
|
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
|
|
[features]
|
|
default = ["base", "call", "std", "protocol"]
|
|
base = ["libc"]
|
|
call = ["base"]
|
|
std = ["base"]
|
|
protocol = ["plain", "bitflags", "redox_syscall"]
|
|
mkns = ["ioslice"]
|
|
|
|
[dependencies]
|
|
bitflags = { version = "2", optional = true }
|
|
libc = { version = "0.2", optional = true }
|
|
# Phase J: path override to the local fork (../syscall
|
|
# relative to the libredox fork's local/sources/libredox/
|
|
# path). This gives libredox access to the EnterS2Idle /
|
|
# ExitS2Idle AcpiVerb variants. Cargo's [patch.crates-io]
|
|
# in the workspace's outer Cargo.toml (in base/ and kernel/)
|
|
# is what wires this path through to the actual
|
|
# redox_syscall crate; this path entry is the libredox-
|
|
# side patch override for the same crate.
|
|
redox_syscall = { path = "../syscall", version = "0.8" }
|
|
ioslice = { version = "0.6", optional = true }
|
|
plain = { version = "0.2", optional = true }
|