From 44a8af5ca558e86d5547ed34a92c03aeb3695b1d Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 30 Aug 2024 12:21:28 -0700 Subject: [PATCH] wip: switch to hc-wasmer fork with win32 fix --- Cargo.lock | 15 +++++---------- crates/host/Cargo.toml | 3 ++- test/Cargo.lock | 15 +++++---------- test/Cargo.toml | 5 +++-- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c31c5cd..8fb2af46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -818,8 +818,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da36c1b427d5ab3b2bca996741a29538f6fba4b0a5dfe20e14fa0d32ec936e3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "bindgen", "bytes", @@ -851,8 +850,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f63537e3d2aa18c9e7e0068d54be75b1a068f53eb7f1b7f7f3b528acd1e75e7" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "backtrace", "bytes", @@ -879,8 +877,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050c01c0e3193bc69b8cbdc47ec432a42aa4dc64964fc500e6740a12801694dc" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "proc-macro-error", "proc-macro2", @@ -891,8 +888,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7832ae1364df93ef680b31523c348204f25810e513b66dfd99d406d985d3e0e5" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "bytecheck", "enum-iterator", @@ -911,8 +907,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6166b3a7b61b64cc71851a33cf01cc5dc8b159f5d05c2d2f650969016032c22f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "backtrace", "cc", diff --git a/crates/host/Cargo.toml b/crates/host/Cargo.toml index dbd29d6a..82a18089 100644 --- a/crates/host/Cargo.toml +++ b/crates/host/Cargo.toml @@ -11,7 +11,8 @@ wasmer = { version = "=4.3.6", optional = true, default-feature = false } wasmer-middlewares = { version = "=4.3.6", optional = true, default-feature = false } # Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } +#hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } +hc-wasmer = { git = "https://github.com/holochain/wasmer", branch = "fix/win32-build", optional = true, default-features = false } holochain_wasmer_common = { version = "=0.0.96", path = "../common" } holochain_serialized_bytes = "=0.0.55" diff --git a/test/Cargo.lock b/test/Cargo.lock index 9cb796ab..e306eb9a 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -971,8 +971,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hc-wasmer" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da36c1b427d5ab3b2bca996741a29538f6fba4b0a5dfe20e14fa0d32ec936e3" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "bindgen", "bytes", @@ -1004,8 +1003,7 @@ dependencies = [ [[package]] name = "hc-wasmer-compiler" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f63537e3d2aa18c9e7e0068d54be75b1a068f53eb7f1b7f7f3b528acd1e75e7" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "backtrace", "bytes", @@ -1032,8 +1030,7 @@ dependencies = [ [[package]] name = "hc-wasmer-derive" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050c01c0e3193bc69b8cbdc47ec432a42aa4dc64964fc500e6740a12801694dc" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1044,8 +1041,7 @@ dependencies = [ [[package]] name = "hc-wasmer-types" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7832ae1364df93ef680b31523c348204f25810e513b66dfd99d406d985d3e0e5" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "bytecheck", "enum-iterator", @@ -1064,8 +1060,7 @@ dependencies = [ [[package]] name = "hc-wasmer-vm" version = "4.3.6-hc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6166b3a7b61b64cc71851a33cf01cc5dc8b159f5d05c2d2f650969016032c22f" +source = "git+https://github.com/holochain/wasmer?branch=fix/win32-build#864327df021e4bec0ad1cb1bab1077a7aa486e0d" dependencies = [ "backtrace", "cc", diff --git a/test/Cargo.toml b/test/Cargo.toml index c5d531ad..e0623fef 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] holochain_wasmer_common = { path = "../crates/common" } -holochain_wasmer_host = { path = "../crates/host", default-features = false } +holochain_wasmer_host = { path = "../crates/host", default-features = false, features = ["error_as_host"] } holochain_serialized_bytes = "=0.0.55" serde = "1" test_common = { path = "./common", default-features = false } @@ -22,7 +22,8 @@ wasmer = { version = "=4.3.6", optional = true, default-features = false } wasmer-middlewares = { version = "=4.3.6", optional = true, default-features = false } # Temporarily include a fork of wasmer from the git branch 'wamr', until it is officially released in wasmer v5 -hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } +#hc-wasmer = { version="=4.3.6-hc.1", optional = true, default-features = false } +hc-wasmer = { git = "https://github.com/holochain/wasmer", branch = "fix/win32-build", optional = true, default-features = false } [dev-dependencies] env_logger = "0.8"