diff --git a/devel/wasm3/Makefile b/devel/wasm3/Makefile index 066af2a79d8b..86645df37084 100644 --- a/devel/wasm3/Makefile +++ b/devel/wasm3/Makefile @@ -1,26 +1,27 @@ PORTNAME= wasm3 DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= freebsd@sysctl.cz COMMENT= The fastest WebAssembly interpreter, and the most universal runtime LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libuv.so:devel/libuv USES= cmake:insource cpe localbase:ldflags CPE_VENDOR= ${PORTNAME}_project USE_GITHUB= yes GH_ACCOUNT= wasm3 GH_PROJECT= wasm3 GH_TUPLE+= vshymanskyy:uvwasi:b063d686848:uvwasi/_deps/uvwasi-src PLIST_FILES= bin/wasm3 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include diff --git a/devel/wasm3/files/patch-CMakeLists.txt b/devel/wasm3/files/patch-CMakeLists.txt index 3b586e383763..8cfe73cd9f54 100644 --- a/devel/wasm3/files/patch-CMakeLists.txt +++ b/devel/wasm3/files/patch-CMakeLists.txt @@ -1,27 +1,36 @@ --- CMakeLists.txt.orig 2021-06-02 10:40:14 UTC +++ CMakeLists.txt +@@ -172,7 +172,7 @@ else() + if(APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mcpu=native") + else() +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -march=native") ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") + endif() + endif() + @@ -188,21 +188,10 @@ if(BUILD_WASI MATCHES "simple") elseif(BUILD_WASI MATCHES "metawasi") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dd_m3HasMetaWASI") elseif(BUILD_WASI MATCHES "uvwasi") - include(FetchContent) - FetchContent_Declare( - uvwasi - GIT_REPOSITORY https://github.com/vshymanskyy/uvwasi.git - GIT_TAG b063d686848c32a26119513056874f051c74258a - ) - - FetchContent_GetProperties(uvwasi) - if(NOT uvwasi_POPULATED) - FetchContent_Populate(uvwasi) - include_directories("${uvwasi_SOURCE_DIR}/include") - add_subdirectory(${uvwasi_SOURCE_DIR} ${uvwasi_BINARY_DIR} EXCLUDE_FROM_ALL) - endif() + add_subdirectory("_deps/uvwasi-src") + include_directories("_deps/uvwasi-src/include") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dd_m3HasUVWASI") - target_link_libraries(${OUT_FILE} uvwasi_a uv_a) + target_link_libraries(${OUT_FILE} uvwasi_a) endif() check_ipo_supported(RESULT result)