Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix static build to link agains zstd #91

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Conversation

jprendes
Copy link
Contributor

It looks like upstream WasmEdge has zstd as a new dependency.
This is not currently captured in the build script, which results in a linking error when using the static feature.
This PR also changes wasmedge-sys minimum requirement from 1.7 to 1.7.4 since wasmedge-sdk is not compatible with wasmedge-sys 1.7.2 (due to the u64 -> Duration change in here)

The missing dependency should have been captured by the rust-static-lib CI workflow, but it seems that workflow has never been triggered:
https://github.com/WasmEdge/wasmedge-rust-sdk/actions/workflows/rust-static-lib.yml
This PR makes no attempt at resolving that.

Copy link
Member

juntao commented Nov 14, 2023

Hello, I am a code review bot on flows.network. Here are my reviews of code commits in this PR.


Commit 034e9187da10f063ad6a2308ffbafde342482401

Key changes in the patch:

  1. The version of wasmedge-sys in Cargo.toml has been changed from 0.17 to 0.17.4.
  2. The "zstd" library has been added to the list of dependencies in build.rs.

Potential problems:

  1. It is difficult to determine if the version change in wasmedge-sys is necessary without more context. It would be helpful to understand why the version was specifically changed to 0.17.4.
  2. Adding the "zstd" library as a dependency could introduce new issues. It is important to test the static build thoroughly to ensure that all dependencies are linked correctly and that there are no conflicts or compatibility issues with other dependencies.
  3. Without the rest of the codebase, it is not possible to determine if there are any other potential problems or conflicts with these changes. It is important to review the entire codebase and consider the implications of these changes on the overall project.

@jprendes
Copy link
Contributor Author

@Mossaka, this should fix the issues in containerd/runwasi#395

@hydai hydai requested a review from apepkuss November 15, 2023 09:56
Copy link
Collaborator

@apepkuss apepkuss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix!

@apepkuss apepkuss merged commit b5daace into WasmEdge:main Nov 15, 2023
34 checks passed
@hydai
Copy link
Member

hydai commented Nov 15, 2023

@apepkuss
Let's tag a new version to ship this on crates.io

@apepkuss
Copy link
Collaborator

@apepkuss Let's tag a new version to ship this on crates.io

Yeah, I'll release a new version. Before that, I'll check the rust-static-lib workflow first as @jprendes mentioned it's not triggered. Thanks!

@apepkuss
Copy link
Collaborator

@jprendes wasmedge-sdk v0.13.2 and wasmedge-sys v0.17.5 have been released. Please check them out. Thanks!

@apepkuss apepkuss mentioned this pull request Nov 16, 2023
apepkuss added a commit that referenced this pull request Nov 28, 2023
* [Refactor] Add #[form] for subtypes of WasmEdgeError.

Signed-off-by: csh <[email protected]>

* [Refactor] fix memory leak

Signed-off-by: csh <[email protected]>

* [Fix] Avoid the CPU 100% by tokio-wasi.

Signed-off-by: csh <[email protected]>

* [Fix] Fix blocking during tokio-wasi TCP connect.

Signed-off-by: csh <[email protected]>

* [Fix] async-wasi get envs & args

Signed-off-by: csh <[email protected]>

* [Perf] Optimize the wasi-ctx

Signed-off-by: csh <[email protected]>

* [Chore] Temporarily disable the serialize feature.

Signed-off-by: csh <[email protected]>

* [feat] virtual file system

Signed-off-by: csh <[email protected]>

* [Refactor] update the argument type of `run_func_with_timeout` and `run_func_async_with_timeout` (#76)

* [Feat] run func timeout use std::time::Duration

Signed-off-by: csh <[email protected]>

* [Doc]: update api docs

Signed-off-by: csh <[email protected]>

---------

Signed-off-by: csh <[email protected]>
(cherry picked from commit 07e84b7)
Signed-off-by: csh <[email protected]>

* [Refactor] delete useless code from validator

Signed-off-by: csh <[email protected]>

* [Refactor] To pass the clippy

Signed-off-by: csh <[email protected]>

* Disable timeout in musl libc (#71)

Signed-off-by: Jorge Prendes <[email protected]>
Signed-off-by: csh <[email protected]>

* Disable timeout in musl libc

Signed-off-by: csh <[email protected]>

* [Doc] update doc

Signed-off-by: csh <[email protected]>

* [Fix] fix ffi::WasmEdge_String to String

Signed-off-by: csh <[email protected]>

* [Fix] Fix unit test

Signed-off-by: csh <[email protected]>

* [Fix] Modify the `WasiModule`.

Signed-off-by: csh <[email protected]>

* [refactor] Introduce `WasmEdge_FunctionInstanceGetData` to drop host data (#84)

* feat(rust-sys): drop host_data in `Function::drop`

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): update `drop` of `ImportModule` and `Function`

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sdk): update test code

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): update `drop` of `ImportModule` and `Function`

Signed-off-by: Xin Liu <[email protected]>

* refactor(rust-sys): update `ImportModule::drop`

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): remove debug code

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sdk): remove debug code

Signed-off-by: Xin Liu <[email protected]>

* version(rust-sdk): bump to `0.13.0`

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): supress clippy warning

Signed-off-by: Xin Liu <[email protected]>

* ci(ci-build): update rust version

Signed-off-by: Xin Liu <[email protected]>

* ci(standalone): update rust version

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): update rustdoc

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sdk): update rustdoc and `README`

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): update dependencies

Signed-off-by: Xin Liu <[email protected]>

* ci: update to `macos-13`

Signed-off-by: Xin Liu <[email protected]>

---------

Signed-off-by: Xin Liu <[email protected]>

* doc: update `CHANGELOG` (#85)

Signed-off-by: Xin Liu <[email protected]>

* [Chore] Update build script (#86)

* chore(rust-sys): update build script

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): update build script

Signed-off-by: Xin Liu <[email protected]>

---------

Signed-off-by: Xin Liu <[email protected]>

* [Fix] Fix sys test

Signed-off-by: csh <[email protected]>

* Relax the version of `wat` dep  (#90)

* chore(rust-sdk): update `wat` dep

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sdk): update test code

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): update test code

Signed-off-by: Xin Liu <[email protected]>

* version(rust-sys): bump to `0.17.4`

Signed-off-by: Xin Liu <[email protected]>

* version(rust-sdk): bump to `0.13.1`

Signed-off-by: Xin Liu <[email protected]>

* doc: update `CHANGELOG`

Signed-off-by: Xin Liu <[email protected]>

---------

Signed-off-by: Xin Liu <[email protected]>

* [CI] skip test_vmbuilder on fedora

Signed-off-by: csh <[email protected]>

* Fix static build to link agains zstd (#91)

Signed-off-by: Jorge Prendes <[email protected]>

* Update doc for releasing `v0.13.2` (#93)

* ci: update workflows

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): update versioning table

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sdk): update versioning table

Signed-off-by: Xin Liu <[email protected]>

* ci(rust-static-lib): fix typo

Signed-off-by: Xin Liu <[email protected]>

* ci(rust-static-lib): update workflow

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): update rustdoc

Signed-off-by: Xin Liu <[email protected]>

* version(rust-sdk): bump to `0.13.2`

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sdk): update versioning table

Signed-off-by: Xin Liu <[email protected]>

* ci(rust-static-lib): update workflow

Signed-off-by: Xin Liu <[email protected]>

---------

Signed-off-by: Xin Liu <[email protected]>

* [Version] Bump `wasmedge-sys` to `v0.17.5` (#94)

* version(rust-sys): bump to `0.17.5`

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): update versioning table

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sys): update dependency

Signed-off-by: Xin Liu <[email protected]>

* chore(rust-sdk): update versioning table

Signed-off-by: Xin Liu <[email protected]>

---------

Signed-off-by: Xin Liu <[email protected]>

* doc: update `CHANGELOG` (#95)

Signed-off-by: Xin Liu <[email protected]>

* [CI] Update `rust-static-lib` workflow (#96)

* ci(rust-static-lib): update workflow

Signed-off-by: Xin Liu <[email protected]>

* ci(rust-static-lib): update workflow

Signed-off-by: Xin Liu <[email protected]>

* ci(rust-static-lib): update workflow

Signed-off-by: Xin Liu <[email protected]>

* ci(rust-static-lib): update workflow

Signed-off-by: Xin Liu <[email protected]>

* ci(rust-static-lib): remove `libboost-all-dev` dep

Signed-off-by: Xin Liu <[email protected]>

---------

Signed-off-by: Xin Liu <[email protected]>

* [Fix] Temporary FuncRef extraction implementation.

Signed-off-by: csh <[email protected]>

* [CI] fix test wat

Signed-off-by: csh <[email protected]>

---------

Signed-off-by: csh <[email protected]>
Signed-off-by: Jorge Prendes <[email protected]>
Signed-off-by: Xin Liu <[email protected]>
Co-authored-by: Jorge Prendes <[email protected]>
Co-authored-by: Xin Liu <[email protected]>
@L-jasmine L-jasmine mentioned this pull request Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants