From f4d5e47a84df5885fa27dbdd7002971b2ac37b6a Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Sat, 25 May 2024 05:08:33 +0000 Subject: [PATCH] bump(main/wasmedge): 0.14.0 (#20306) --- packages/wasmedge/build.sh | 6 +++--- packages/wasmedge/cmake-Helper.cmake.patch | 17 +++++++---------- packages/wasmedge/lib-host-wasi-linux.h.patch | 15 --------------- .../wasmedge/lib-loader-aot_section.cpp.patch | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 packages/wasmedge/lib-host-wasi-linux.h.patch create mode 100644 packages/wasmedge/lib-loader-aot_section.cpp.patch diff --git a/packages/wasmedge/build.sh b/packages/wasmedge/build.sh index 0bc56a78fd..e102f0b815 100644 --- a/packages/wasmedge/build.sh +++ b/packages/wasmedge/build.sh @@ -3,14 +3,14 @@ TERMUX_PKG_DESCRIPTION="A lightweight, high-performance, and extensible WebAssem TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_LICENSE_FILE="LICENSE, LICENSE.spdx" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.13.5" +TERMUX_PKG_VERSION="0.14.0" TERMUX_PKG_SRCURL=https://github.com/WasmEdge/WasmEdge/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=588b8933a89f75c3ee5d4b92fe9d65294ae86fd48a95d2d4ac1a93ee3c5e1d75 +TERMUX_PKG_SHA256=27ef0ffa399fbaf44fb43733ea4ae4a4c1d9836a175269924ffd7e3d258d3567 TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DWASMEDGE_BUILD_AOT_RUNTIME=OFF -DWASMEDGE_FORCE_DISABLE_LTO=ON +-DWASMEDGE_USE_LLVM=OFF " termux_step_pre_configure() { diff --git a/packages/wasmedge/cmake-Helper.cmake.patch b/packages/wasmedge/cmake-Helper.cmake.patch index 73fd3f5d24..57d5009c4d 100644 --- a/packages/wasmedge/cmake-Helper.cmake.patch +++ b/packages/wasmedge/cmake-Helper.cmake.patch @@ -1,7 +1,8 @@ -diff -uNr WasmEdge-0.13.5/cmake/Helper.cmake WasmEdge-0.13.5.mod/cmake/Helper.cmake ---- WasmEdge-0.13.5/cmake/Helper.cmake 2023-11-03 17:42:42.000000000 +0800 -+++ WasmEdge-0.13.5.mod/cmake/Helper.cmake 2023-11-04 11:06:08.692786451 +0800 -@@ -37,17 +37,11 @@ +diff --git a/cmake/Helper.cmake b/cmake/Helper.cmake +index 992e469..4075621 100644 +--- a/cmake/Helper.cmake ++++ b/cmake/Helper.cmake +@@ -37,13 +37,6 @@ else() -Wextra ) @@ -10,12 +11,8 @@ diff -uNr WasmEdge-0.13.5/cmake/Helper.cmake WasmEdge-0.13.5.mod/cmake/Helper.cm - -Werror - -Wno-error=pedantic - ) - if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13) - list(APPEND WASMEDGE_CFLAGS - -Wno-error=dangling-reference - ) - endif() - endif() - +- if(WASMEDGE_ENABLE_UB_SANITIZER) list(APPEND WASMEDGE_CFLAGS -fsanitize=undefined) + endif() diff --git a/packages/wasmedge/lib-host-wasi-linux.h.patch b/packages/wasmedge/lib-host-wasi-linux.h.patch deleted file mode 100644 index 0e1300c711..0000000000 --- a/packages/wasmedge/lib-host-wasi-linux.h.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -uNr WasmEdge/lib/host/wasi/linux.h WasmEdge.mod/lib/host/wasi/linux.h ---- WasmEdge/lib/host/wasi/linux.h 2022-07-28 18:56:12.000000000 +0800 -+++ WasmEdge.mod/lib/host/wasi/linux.h 2022-08-15 01:48:53.044855896 +0800 -@@ -319,7 +319,11 @@ - } - } - -+#if !defined __ANDROID__ || defined __aarch64__ || defined __x86_64__ - inline constexpr __wasi_filetype_t fromFileType(mode_t Mode) noexcept { -+#else -+inline constexpr __wasi_filetype_t fromFileType(unsigned int Mode) noexcept { -+#endif - switch (Mode & S_IFMT) { - case S_IFBLK: - return __WASI_FILETYPE_BLOCK_DEVICE; diff --git a/packages/wasmedge/lib-loader-aot_section.cpp.patch b/packages/wasmedge/lib-loader-aot_section.cpp.patch new file mode 100644 index 0000000000..c9b914f1a5 --- /dev/null +++ b/packages/wasmedge/lib-loader-aot_section.cpp.patch @@ -0,0 +1,18 @@ +diff --git a/lib/loader/aot_section.cpp b/lib/loader/aot_section.cpp +index bc09eb4..ac1339d 100644 +--- a/lib/loader/aot_section.cpp ++++ b/lib/loader/aot_section.cpp +@@ -7,8 +7,13 @@ + + #if WASMEDGE_OS_LINUX || WASMEDGE_OS_MACOS + extern "C" { ++#ifdef __arm__ ++void __register_frame(void *) {} ++void __deregister_frame(void *) {} ++#else + extern void __register_frame(void *); + extern void __deregister_frame(void *); ++#endif + } + #endif +