ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wasmi MacOs build (#6051)

Browse Source
This commit is contained in:
Olek
2025-11-18 19:07:37 -05:00
committed by Oleksandr
parent fdf915e16f
commit db83c7481b
2 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
external/wasmi/patches/static_only.patch vendored
View File

@@ -1,15 +0,0 @@
diff --git a/crates/c_api/CMakeLists.txt b/crates/c_api/CMakeLists.txt
index b15c787..97dd294 100644
--- a/crates/c_api/CMakeLists.txt
+++ b/crates/c_api/CMakeLists.txt
@@ -43,6 +43,10 @@ endif()
list(TRANSFORM WASMI_SHARED_FILES PREPEND ${WASMI_TARGET_DIR}/)
list(TRANSFORM WASMI_STATIC_FILES PREPEND ${WASMI_TARGET_DIR}/)
+if(NOT BUILD_SHARED_LIBS)
+ set(WASMI_SHARED_FILES )
+endif()
+
# Instructions on how to build and install the Wasmi Rust crate.
find_program(WASMI_CARGO_BINARY cargo REQUIRED)
include(ExternalProject)

44
external/wasmi/patches/wasmi.patch vendored
View File

@@ -1,5 +1,5 @@
diff --git a/crates/c_api/CMakeLists.txt b/crates/c_api/CMakeLists.txt
index b15c787a..0d0a04b7 100644
index b15c787a..2420bea2 100644
--- a/crates/c_api/CMakeLists.txt
+++ b/crates/c_api/CMakeLists.txt
@@ -43,6 +43,11 @@ endif()
@@ -14,6 +14,48 @@ index b15c787a..0d0a04b7 100644
# Instructions on how to build and install the Wasmi Rust crate.
find_program(WASMI_CARGO_BINARY cargo REQUIRED)
include(ExternalProject)
@@ -112,23 +117,25 @@ install(
DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
-if(WASMI_TARGET MATCHES "darwin")
- set(INSTALLED_LIB "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libwasmi.dylib")
- install(
- FILES "${INSTALLED_LIB}"
- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
- COMPONENT Runtime
- )
- if(NOT CMAKE_INSTALL_NAME_TOOL)
- message(WARNING "CMAKE_INSTALL_NAME_TOOL is not set. LC_ID_DYLIB for libwasmi.dylib will not be set.")
- else()
- set(install_name_tool_cmd
- "${CMAKE_INSTALL_NAME_TOOL}"
- "-id"
- "@rpath/libwasmi.dylib"
- "${INSTALLED_LIB}"
+if(BUILD_SHARED_LIBS)
+ if(WASMI_TARGET MATCHES "darwin")
+ set(INSTALLED_LIB "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libwasmi.dylib")
+ install(
+ FILES "${INSTALLED_LIB}"
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
+ COMPONENT Runtime
)
- install(CODE "execute_process(COMMAND ${install_name_tool_cmd})")
+ if(NOT CMAKE_INSTALL_NAME_TOOL)
+ message(WARNING "CMAKE_INSTALL_NAME_TOOL is not set. LC_ID_DYLIB for libwasmi.dylib will not be set.")
+ else()
+ set(install_name_tool_cmd
+ "${CMAKE_INSTALL_NAME_TOOL}"
+ "-id"
+ "@rpath/libwasmi.dylib"
+ "${INSTALLED_LIB}"
+ )
+ install(CODE "execute_process(COMMAND ${install_name_tool_cmd})")
+ endif()
endif()
endif()
diff --git a/crates/c_api/include/wasm.h b/crates/c_api/include/wasm.h
index 5ee617ff..0199192d 100644
--- a/crates/c_api/include/wasm.h