ericLemanissier/conan-center-index
1
0
Fork 1
mirror of https://github.com/conan-io/conan-center-index.git synced 2025-06-17 01:05:02 +00:00
Code Issues 4 Packages Projects Releases Wiki Activity

(#21767) wasm-micro-runtime: add version 1.3.3, 2.2.0

Browse Source 
* wasm-micro-runtime: add version 1.3.0

* link ntdll on msvc

* link ntdll on Win32

* fix condition for ntdll

* update 1.3.2

* Updated v1.3.2 to v1.3.3 and adapted patch

* Added new version v2.1.0

* Fixed missing versions on config.yml

* update 2.1.2

* update 2.2.0

---------

Co-authored-by: PerseoGI <perseog@jfrog.com>
This commit is contained in:
toge
2024-10-24 02:23:55 +09:00
committed by GitHub
parent 0b1bf87ea3
commit c99be0cb8c
5 changed files with 140 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
recipes/wasm-micro-runtime/all/conandata.yml
View File

@ -1,4 +1,10 @@
sources: sources:
"2.2.0":
url: "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-2.2.0.tar.gz"
sha256: "93b6ba03f681e061967106046b1908631ee705312b9a6410f3baee7af7c6aac9"
"1.3.3":
url: "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-1.3.3.tar.gz"
sha256: "94d18b081b6fac0574faf36338c7762a659ff175b9ae2cbc1c0a8f045edcbe7a"
"1.2.3": "1.2.3":
url: "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-1.2.3.tar.gz" url: "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-1.2.3.tar.gz"
sha256: "85057f788630dc1b8c371f5443cc192627175003a8ea63c491beaff29a338346" sha256: "85057f788630dc1b8c371f5443cc192627175003a8ea63c491beaff29a338346"
@ -6,6 +12,14 @@ sources:
url: "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-1.2.2.tar.gz" url: "https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-1.2.2.tar.gz"
sha256: "d328fc1e19c54cfdb4248b861de54b62977b9b85c0a40eaaeb9cd9b628c0c788" sha256: "d328fc1e19c54cfdb4248b861de54b62977b9b85c0a40eaaeb9cd9b628c0c788"
patches: patches:
"2.2.0":
- patch_file: "patches/2.2.0-0001-fix-cmake.patch"
patch_description: "link ntdll on Windows"
patch_type: "conan"
"1.3.3":
- patch_file: "patches/1.3.3-0001-fix-cmake.patch"
patch_description: "separate static and shared build, link ntdll on Windows"
patch_type: "conan"
"1.2.3": "1.2.3":
- patch_file: "patches/1.2.3-0001-fix-cmake.patch" - patch_file: "patches/1.2.3-0001-fix-cmake.patch"
patch_description: "separate static and shasred build" patch_description: "separate static and shasred build"

3
recipes/wasm-micro-runtime/all/conanfile.py
View File

@ -4,6 +4,7 @@ from conan.tools.files import apply_conandata_patches, export_conandata_patches,
from conan.tools.build import check_min_cppstd from conan.tools.build import check_min_cppstd
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
from conan.tools.microsoft import is_msvc from conan.tools.microsoft import is_msvc
from conan.tools.scm import Version
import os import os
required_conan_version = ">=1.53.0" required_conan_version = ">=1.53.0"
@ -136,3 +137,5 @@ class WasmMicroRuntimeConan(ConanFile):
self.cpp_info.system_libs.append("pthread") self.cpp_info.system_libs.append("pthread")
if self.settings.os == "Windows": if self.settings.os == "Windows":
self.cpp_info.system_libs.append("ws2_32") self.cpp_info.system_libs.append("ws2_32")
if Version(self.version) >= "1.3.0":
self.cpp_info.system_libs.append("ntdll")

64
recipes/wasm-micro-runtime/all/patches/1.3.3-0001-fix-cmake.patch Normal file
View File

@ -0,0 +1,64 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ffba05..68d03d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,10 +114,10 @@ set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake)
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wshadow -Wno-unused-parameter")
+# set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wshadow -Wno-unused-parameter")
# set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion -Wsign-conversion")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wno-unused")
+# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wno-unused")
if (WAMR_BUILD_TARGET MATCHES "X86_.*" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")
if (NOT (CMAKE_C_COMPILER MATCHES ".*clang.*" OR CMAKE_C_COMPILER_ID MATCHES ".*Clang"))
@@ -135,22 +135,34 @@ endif ()
include (${SHARED_DIR}/utils/uncommon/shared_uncommon.cmake)
+if (NOT BUILD_SHARED_LIBS)
# STATIC LIBRARY
add_library(iwasm_static STATIC ${WAMR_RUNTIME_LIB_SOURCE})
set_target_properties (iwasm_static PROPERTIES OUTPUT_NAME vmlib)
target_include_directories(iwasm_static INTERFACE ${WAMR_ROOT_DIR}/core/iwasm/include)
-target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread)
+# target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread)
+target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS})
+if(NOT MSVC)
+ target_link_libraries (iwasm_static INTERFACE -lm -ldl -lpthread)
+endif()
if (WAMR_BUILD_WASM_CACHE EQUAL 1)
target_link_libraries(iwasm_static INTERFACE boringssl_crypto)
endif ()
install (TARGETS iwasm_static ARCHIVE DESTINATION lib)
-
+else()
# SHARED LIBRARY
add_library (iwasm_shared SHARED ${WAMR_RUNTIME_LIB_SOURCE})
set_target_properties (iwasm_shared PROPERTIES OUTPUT_NAME iwasm)
target_include_directories(iwasm_shared INTERFACE ${WAMR_ROOT_DIR}/core/iwasm/include)
-target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread)
+# target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread)
+target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS})
+if(NOT MSVC)
+ target_link_libraries (iwasm_shared INTERFACE -lm -ldl -lpthread)
+endif()
+if(WIN32)
+ target_link_libraries (iwasm_shared PUBLIC ntdll)
+endif()
if (WAMR_BUILD_WASM_CACHE EQUAL 1)
target_link_libraries(iwasm_shared INTERFACE boringssl_crypto)
endif ()
@@ -160,6 +172,7 @@ if (MINGW)
endif ()
install (TARGETS iwasm_shared LIBRARY DESTINATION lib)
+endif()
# HEADERS
install (FILES

55
recipes/wasm-micro-runtime/all/patches/2.2.0-0001-fix-cmake.patch Normal file
View File

@ -0,0 +1,55 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40658e9..05538a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,13 +122,13 @@ set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake)
if (NOT WIN32)
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat -Wformat-security \
- -ffunction-sections -fdata-sections \
- -Wno-unused-parameter -Wno-pedantic \
- -fvisibility=hidden")
+ # set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat -Wformat-security \
+ # -ffunction-sections -fdata-sections \
+ # -Wno-unused-parameter -Wno-pedantic \
+ # -fvisibility=hidden")
# Remove the extra spaces for better make log
string (REGEX REPLACE " *" " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wno-unused")
+ # set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wformat -Wformat-security -Wno-unused")
endif()
if (WAMR_BUILD_TARGET MATCHES "X86_.*" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")
@@ -159,7 +159,14 @@ if (WAMR_BUILD_STATIC)
add_library(iwasm_static STATIC ${WAMR_RUNTIME_LIB_SOURCE})
set_target_properties (iwasm_static PROPERTIES OUTPUT_NAME vmlib)
target_include_directories(iwasm_static INTERFACE ${WAMR_ROOT_DIR}/core/iwasm/include)
- target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries (iwasm_static INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+ if(NOT MSVC)
+ target_link_libraries (iwasm_static INTERFACE -lm -ldl)
+ endif()
+ if(WIN32)
+ target_link_libraries (iwasm_static PUBLIC ntdll)
+ endif()
if (WAMR_BUILD_WASM_CACHE EQUAL 1)
target_link_libraries(iwasm_static INTERFACE boringssl_crypto)
endif ()
@@ -180,7 +187,14 @@ if (WAMR_BUILD_SHARED)
add_library (iwasm_shared SHARED ${WAMR_RUNTIME_LIB_SOURCE})
set_target_properties (iwasm_shared PROPERTIES OUTPUT_NAME iwasm)
target_include_directories(iwasm_shared INTERFACE ${WAMR_ROOT_DIR}/core/iwasm/include)
- target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries (iwasm_shared INTERFACE ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+ if(NOT MSVC)
+ target_link_libraries (iwasm_shared INTERFACE -lm -ldl)
+ endif()
+ if(WIN32)
+ target_link_libraries (iwasm_shared PUBLIC ntdll)
+ endif()
if (WAMR_BUILD_WASM_CACHE EQUAL 1)
target_link_libraries(iwasm_shared INTERFACE boringssl_crypto)
endif ()

4
recipes/wasm-micro-runtime/config.yml
View File

@ -1,4 +1,8 @@
versions: versions:
"2.2.0":
folder: all
"1.3.3":
folder: all
"1.2.3": "1.2.3":
folder: all folder: all
"1.2.2": "1.2.2":