mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 20:17:46 +08:00
Merge branch 'scriptisto' into 'master'
Fix compilation for scriptisto See merge request redox-os/redox!2392
This commit is contained in:
commit
1961e941e0
@ -257,6 +257,7 @@ rustual-boy = {}
|
||||
rusty-checkers = {}
|
||||
rusty-rain = {}
|
||||
rvvm = {}
|
||||
scriptisto = {}
|
||||
scummvm = {}
|
||||
sdl-gfx = {}
|
||||
sdl1 = {}
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
#TODO liberrno linking error: undefined reference to `errno_location'
|
||||
#TODO compiled but not tested
|
||||
[source]
|
||||
git = "https://github.com/igor-petruk/scriptisto"
|
||||
rev = "511875fe6"
|
||||
shallow_clone = true
|
||||
patches = [
|
||||
"redox.patch"
|
||||
]
|
||||
[build]
|
||||
template = "cargo"
|
||||
|
||||
66
recipes/wip/dev/rust-tools/scriptisto/redox.patch
Normal file
66
recipes/wip/dev/rust-tools/scriptisto/redox.patch
Normal file
@ -0,0 +1,66 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index c414c6b..08c7dd0 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -37,12 +37,6 @@ version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
||||
|
||||
-[[package]]
|
||||
-name = "cc"
|
||||
-version = "1.0.99"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
|
||||
-
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
@@ -184,30 +178,18 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
-version = "0.2.8"
|
||||
+version = "0.3.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
|
||||
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
|
||||
dependencies = [
|
||||
- "errno-dragonfly",
|
||||
- "libc",
|
||||
- "winapi",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "errno-dragonfly"
|
||||
-version = "0.1.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
"libc",
|
||||
+ "windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "exec"
|
||||
version = "0.3.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "886b70328cba8871bfc025858e1de4be16b1d5088f2ba50b57816f4210672615"
|
||||
+source = "git+https://github.com/alexanderkjall/exec-rs?branch=upgrade-errno-to-0.3#8e4a7edb00b2d0aed0100c1803bc4afd3e79d5c3"
|
||||
dependencies = [
|
||||
"errno",
|
||||
"libc",
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index a9c208a..0d8f354 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -53,6 +53,9 @@ clap = { version = "3", features = ["derive"] }
|
||||
default-features = false
|
||||
version = '0'
|
||||
|
||||
+[patch.crates-io]
|
||||
+exec = { git = "https://github.com/alexanderkjall/exec-rs", branch = "upgrade-errno-to-0.3" }
|
||||
+
|
||||
[package.metadata.deb]
|
||||
section = "utils"
|
||||
assets = [
|
||||
Loading…
Reference in New Issue
Block a user