foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-25 16:49:18 -05:00
Code Issues Packages 1 Wiki Activity

Use libffi-rs instead of deno-libffi (#12555)

Browse source 
Fork is no longer necessary since https://github.com/tov/libffi-rs/pull/33
landed.
This commit is contained in:
Ryan Dahl 2021-10-26 16:30:27 -04:00 committed by GitHub
parent cf9c4f0031
commit 9161e74a7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Cargo.lock generated
View file

@ -693,27 +693,6 @@ dependencies = [
"winres",
]
[[package]]
name = "deno-libffi"
version = "0.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8c576e40bd48d120b433ee248e221a89f6c2556d580e409aeede79c5c899c86"
dependencies = [
"abort_on_panic",
"deno-libffi-sys",
"libc",
]
[[package]]
name = "deno-libffi-sys"
version = "0.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d17b3e8597c2424b077029461fae4f24e1c01b2073cf91ae2a13412d676181b8"
dependencies = [
"cc",
"make-cmd",
]
[[package]]
name = "deno_ast"
version = "0.4.1"
@ -837,9 +816,9 @@ dependencies = [
name = "deno_ffi"
version = "0.10.0"
dependencies = [
"deno-libffi",
"deno_core",
"dlopen",
"libffi",
"serde",
"tokio",
"winapi 0.3.9",
@ -2043,6 +2022,26 @@ version = "0.2.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6"
[[package]]
name = "libffi"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a1a541960580e84812cac19ec26926e883520bda211397a1f8c223993be6f20"
dependencies = [
"abort_on_panic",
"libc",
"libffi-sys",
]
[[package]]
name = "libffi-sys"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78a343392242972b1b7ac640de99f9abcb10ca42adcd996f6016514071cdbcc6"
dependencies = [
"cc",
]
[[package]]
name = "libloading"
version = "0.7.1"
@ -2154,12 +2153,6 @@ dependencies = [
"syn 1.0.65",
]
[[package]]
name = "make-cmd"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8ca8afbe8af1785e09636acb5a41e08a765f5f0340568716c18a8700ba3c0d3"
[[package]]
name = "malloc_buf"
version = "0.0.6"

2
ext/ffi/Cargo.toml
View file

@ -16,7 +16,7 @@ path = "lib.rs"
[dependencies]
deno_core = { version = "0.105.0", path = "../../core" }
dlopen = "0.1.8"
libffi = { version = "=0.0.7", package = "deno-libffi" }
libffi = "2.0.0"
serde = { version = "1.0.129", features = ["derive"] }
tokio = { version = "1.10.1", features = ["full"] }