Skip to content

Commit bc00683

Browse files
committed
cmake: Update wasm3 externalproject
1 parent 25205ab commit bc00683

File tree

5 files changed

+18
-126
lines changed

5 files changed

+18
-126
lines changed

cmake/ProjectWasm3.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@ set(wasm3_library ${binary_dir}/source/${CMAKE_STATIC_LIBRARY_PREFIX}m3${CMAKE_S
1414
ExternalProject_Add(wasm3
1515
EXCLUDE_FROM_ALL 1
1616
PREFIX ${prefix}
17-
DOWNLOAD_NAME wasm3-v0.4.7.tar.gz
17+
DOWNLOAD_NAME wasm3-d339389d.tar.gz
1818
DOWNLOAD_DIR ${prefix}/downloads
1919
SOURCE_DIR ${source_dir}
2020
BINARY_DIR ${binary_dir}
21-
URL https://github.com/wasm3/wasm3/archive/v0.4.7.tar.gz
22-
URL_HASH SHA256=11e863a643f605d62a5276e342abb01a65d33d138d01ea0070622a3f78fa1bd5
21+
URL https://github.com/wasm3/wasm3/archive/dee9389d831a6ed5101155f31d217e47c4ad8175.tar.gz
22+
URL_HASH SHA256=8ef1470884ecadad105e7e2bc37fb9cbf2242c87157201f02861874c8b419bbd
2323
PATCH_COMMAND ${CMAKE_CURRENT_LIST_DIR}/apply_patches.sh
2424
CMAKE_ARGS
2525
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
2626
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
2727
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
28+
-DCMAKE_C_FLAGS="-Wno-sign-compare"
2829
-DBUILD_WASI=none
29-
-DBUILD_PORTABLE=ON
30+
-DBUILD_NATIVE=OFF
3031
INSTALL_COMMAND ""
3132
BUILD_BYPRODUCTS ${wasm3_library}
3233
)

cmake/wasm3_01_extapi.patch

Lines changed: 0 additions & 76 deletions
This file was deleted.

cmake/wasm3_01_startfunc.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Should not need this patch. See details in issue https://github.com/wasm3/wasm3/issues/202
2+
3+
diff -burN wasm3.orig/source/m3_env.c wasm3/source/m3_env.c
4+
--- wasm3.orig/source/m3_env.c 2021-02-22 23:29:50.000000000 +0000
5+
+++ wasm3/source/m3_env.c 2021-02-22 23:29:19.000000000 +0000
6+
@@ -695,6 +695,7 @@
7+
8+
// Start func might use imported functions, which are not liked here yet,
9+
// so it will be called before a function call is attempted (in m3_FindFuSnction)
10+
+_ (InitStartFunc (io_module));
11+
}
12+
else result = m3Err_moduleAlreadyLinked;
13+

cmake/wasm3_02_portable.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

cmake/wasm3_03_startfunc.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)