diff --git a/Cargo.toml b/Cargo.toml index f0f4812add..bbafd2ff9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,73 +1,34 @@ -# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO -# -# When uploading crates to the registry Cargo will automatically -# "normalize" Cargo.toml files for maximal compatibility -# with all versions of Cargo and also rewrite `path` dependencies -# to registry (e.g., crates.io) dependencies. -# -# If you are reading this file be aware that the original Cargo.toml -# will likely look very different (and much more reasonable). -# See Cargo.toml.orig for the original contents. - [package] -edition = "2021" name = "libredox" -version = "0.1.18" authors = ["4lDO2 <4lDO2@protonmail.com>"] -build = false -exclude = ["target"] -autolib = false -autobins = false -autoexamples = false -autotests = false -autobenches = false -description = "Redox stable ABI" -readme = false +version = "0.1.18-rb1" +edition = "2021" license = "MIT" -repository = "https://gitlab.redox-os.org/redox-os/libredox.git" +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"] -default = [ - "base", - "call", - "std", - "protocol", -] -mkns = ["ioslice"] -protocol = [ - "plain", - "bitflags", -] std = ["base"] +protocol = ["plain", "bitflags"] +mkns = ["ioslice"] +# Upstream `libredox 0.1.18` exposes `redox_syscall` as a feature alias +# over an optional `redox_syscall` dep. Crates like `redox-scheme 0.11.2` +# from crates.io request `features = ["redox_syscall"]` on libredox. The +# Red Bear fork has `redox_syscall` as a non-optional path dep (always +# included via `local/sources/syscall/`), so the feature is a no-op alias +# that just satisfies feature-name lookup without enabling anything extra. +redox_syscall = [] -[lib] -name = "libredox" -path = "src/lib.rs" - -[dependencies.bitflags] -version = "2" -optional = true - -[dependencies.ioslice] -version = "0.6" -optional = true - -[dependencies.libc] -version = "0.2" -optional = true - -[dependencies.plain] -version = "0.2" -optional = true - -# Red Bear OS Phase J: path override to the local syscall -# fork. The local fork at ../syscall/ adds the -# EnterS2Idle/ExitS2Idle AcPiVerb variants. This breaks -# the libredox::error::Error <-> syscall::Error type- -# identity barrier that previously caused E0277 errors in -# scheme-utils and daemon. -[dependencies.redox_syscall] -path = "../syscall" -version = "0.8" +[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 non-optional and not listed in [features]. +redox_syscall = { path = "../syscall", version = "0.9.0-rb1" } +ioslice = { version = "0.6", optional = true } +plain = { version = "0.2", optional = true }