subject:"\[gentoo\-commits\] repo\/proj\/guru\:dev commit in\: dev\-lang\/wabt\/files\/, dev\-lang\/wabt\/"

[gentoo-commits] repo/proj/guru:dev commit in: dev-lang/wabt/files/, dev-lang/wabt/

2022-10-03 Thread Haelwenn Monnier

commit: 37e16f64f8bb38f72a2271c8a01229cfdb746dfe
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Tue Oct  4 02:23:02 2022 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Tue Oct  4 02:44:11 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=37e16f64

dev-lang/wabt: Remove *.wasm blobs from $S

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

 .../wabt/files/wabt-1.0.29-wasm-blob-tests.patch   | 58 ++
 dev-lang/wabt/wabt-1.0.29.ebuild   |  7 +++
 2 files changed, 65 insertions(+)

diff --git a/dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch 
b/dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch
new file mode 100644
index 0..aacce18fd
--- /dev/null
+++ b/dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch
@@ -0,0 +1,58 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1fe79b8d..5ebf8f87 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -632,52 +632,7 @@ if (BUILD_TESTS)
+ ${USES_TERMINAL}
+   )
+ 
+-  add_custom_target(run-c-api-tests
+-COMMAND ${PYTHON_EXECUTABLE} 
${WABT_SOURCE_DIR}/test/run-c-api-examples.py --bindir 
$
+-WORKING_DIRECTORY ${WABT_SOURCE_DIR}
+-${USES_TERMINAL}
+-  )
+-
+-  add_custom_target(check DEPENDS run-unittests run-tests run-c-api-tests)
+-
+-  function(c_api_example NAME)
+-set(EXENAME wasm-c-api-${NAME})
+-add_executable(${EXENAME} third_party/wasm-c-api/example/${NAME}.c)
+-if (COMPILER_IS_MSVC)
+-  set_target_properties(${EXENAME} PROPERTIES COMPILE_FLAGS "-wd4311")
+-else ()
+-  set_target_properties(${EXENAME} PROPERTIES COMPILE_FLAGS "-std=gnu11 
-Wno-pointer-to-int-cast")
+-endif ()
+-
+-target_link_libraries(${EXENAME} wasm Threads::Threads)
+-add_custom_target(${EXENAME}-copy-to-bin ALL
+-  COMMAND ${CMAKE_COMMAND} -E make_directory ${WABT_SOURCE_DIR}/bin
+-  COMMAND ${CMAKE_COMMAND} -E copy $ 
${WABT_SOURCE_DIR}/bin/
+-  COMMAND ${CMAKE_COMMAND} -E copy 
${WABT_SOURCE_DIR}/third_party/wasm-c-api/example/${NAME}.wasm 
$/
+-  COMMAND ${CMAKE_COMMAND} -E copy 
${WABT_SOURCE_DIR}/third_party/wasm-c-api/example/${NAME}.wasm 
${WABT_SOURCE_DIR}/bin/
+-  DEPENDS ${EXENAME}
+-)
+-add_dependencies(run-c-api-tests ${EXENAME})
+-  endfunction()
+-
+-  c_api_example(callback)
+-  c_api_example(finalize)
+-  c_api_example(global)
+-  c_api_example(hello)
+-  c_api_example(hostref)
+-  c_api_example(multi)
+-  c_api_example(memory)
+-  c_api_example(reflect)
+-  c_api_example(serialize)
+-  c_api_example(start)
+-  c_api_example(table)
+-  c_api_example(trap)
+-  if (NOT WIN32)
+-# depends on pthreads
+-set(THREADS_PREFER_PTHREAD_FLAG ON)
+-find_package(Threads REQUIRED)
+-c_api_example(threads)
+-  endif ()
++  add_custom_target(check DEPENDS run-unittests run-tests)
+ endif ()
+ 
+ # install

diff --git a/dev-lang/wabt/wabt-1.0.29.ebuild b/dev-lang/wabt/wabt-1.0.29.ebuild
index 18e045454..ffbff44c8 100644
--- a/dev-lang/wabt/wabt-1.0.29.ebuild
+++ b/dev-lang/wabt/wabt-1.0.29.ebuild
@@ -20,12 +20,19 @@ RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-cpp/gtest )"
 BDEPEND="${PYTHON_DEPS}"
 
+PATCHES=(
+   # Disable tests depending on third_party/wasm-c-api/example/*.wasm
+   "${FILESDIR}/wabt-1.0.29-wasm-blob-tests.patch"
+)
+
 src_prepare() {
cmake_src_prepare
 
# Submodules kept: third_party/testsuite third_party/wasm-c-api
rm -r third_party/gtest third_party/ply third_party/uvwasi || die
 
+   rm third_party/wasm-c-api/example/*.wasm fuzz-in/wasm/stuff.wasm 
wasm2c/examples/fac/fac.wasm || die
+
sed -i 's;default_compiler =.*;default_compiler = os.getenv("CC", 
"cc");' test/run-spec-wasm2c.py || die
 }

[gentoo-commits] repo/proj/guru:dev commit in: dev-lang/wabt/files/, dev-lang/wabt/

2022-10-03 Thread Haelwenn Monnier

commit: 4c1ed292be49648493cb6998c03157e345925e38
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Tue Oct  4 02:37:03 2022 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Tue Oct  4 02:44:11 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4c1ed292

dev-lang/wabt: drop 1.0.29, add 1.0.30

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

 dev-lang/wabt/Manifest  |  2 +-
 ...m-blob-tests.patch => wabt-1.0.30-wasm-blob-tests.patch} | 13 +
 dev-lang/wabt/{wabt-1.0.29.ebuild => wabt-1.0.30.ebuild}|  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dev-lang/wabt/Manifest b/dev-lang/wabt/Manifest
index 34c549d92..a0603a36c 100644
--- a/dev-lang/wabt/Manifest
+++ b/dev-lang/wabt/Manifest
@@ -1 +1 @@
-DIST wabt-1.0.29.tar.xz 1977856 BLAKE2B 
08ad2cf96ba743dd094a05f51ab86341fb0403737b35ff8f4e5d5041dfd27994af0215565085f1a1818d847f4587c93e91cebc9f63df6b401f4f295101f6d760
 SHA512 
fa791c29ecc4e8795d5afa6ffd8fcb0b3e39b89f4b936611e86759aafcb77b91c7b02e899d07c8e9ee871ac66e40f44579ec788e2d18a87d4f48dbf795c6c045
+DIST wabt-1.0.30.tar.xz 2020572 BLAKE2B 
eda0074b0839908bb837921ed451aa0c022dc1fe8ee594f64294115dc020edc92e59d259d033d3290c843f501be0bb87e3e9b44e31ba6f6b427898db25a65380
 SHA512 
d7a76d6c96c1a6098111ebfb1a252a0dbd7952a014300015ee39808afcc2243fdb0794a8e2fb7fb26b11c1ecca7923c2fe6210aa6a85d7f6b001c11fe451a816

diff --git a/dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch 
b/dev-lang/wabt/files/wabt-1.0.30-wasm-blob-tests.patch
similarity index 88%
rename from dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch
rename to dev-lang/wabt/files/wabt-1.0.30-wasm-blob-tests.patch
index aacce18fd..df9188e91 100644
--- a/dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch
+++ b/dev-lang/wabt/files/wabt-1.0.30-wasm-blob-tests.patch
@@ -1,15 +1,15 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1fe79b8d..5ebf8f87 100644
+index 2935e9e5..949e4e38 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -632,52 +632,7 @@ if (BUILD_TESTS)
- ${USES_TERMINAL}
+@@ -658,49 +658,7 @@ if (BUILD_TESTS)
+ USES_TERMINAL
)
  
 -  add_custom_target(run-c-api-tests
 -COMMAND ${PYTHON_EXECUTABLE} 
${WABT_SOURCE_DIR}/test/run-c-api-examples.py --bindir 
$
 -WORKING_DIRECTORY ${WABT_SOURCE_DIR}
--${USES_TERMINAL}
+-USES_TERMINAL
 -  )
 -
 -  add_custom_target(check DEPENDS run-unittests run-tests run-c-api-tests)
@@ -46,10 +46,7 @@ index 1fe79b8d..5ebf8f87 100644
 -  c_api_example(start)
 -  c_api_example(table)
 -  c_api_example(trap)
--  if (NOT WIN32)
--# depends on pthreads
--set(THREADS_PREFER_PTHREAD_FLAG ON)
--find_package(Threads REQUIRED)
+-  if (CMAKE_USE_PTHREADS_INIT)
 -c_api_example(threads)
 -  endif ()
 +  add_custom_target(check DEPENDS run-unittests run-tests)

diff --git a/dev-lang/wabt/wabt-1.0.29.ebuild b/dev-lang/wabt/wabt-1.0.30.ebuild
similarity index 96%
rename from dev-lang/wabt/wabt-1.0.29.ebuild
rename to dev-lang/wabt/wabt-1.0.30.ebuild
index a9544f217..da332c8fe 100644
--- a/dev-lang/wabt/wabt-1.0.29.ebuild
+++ b/dev-lang/wabt/wabt-1.0.30.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 
 PATCHES=(
# Disable tests depending on third_party/wasm-c-api/example/*.wasm
-   "${FILESDIR}/wabt-1.0.29-wasm-blob-tests.patch"
+   "${FILESDIR}/wabt-1.0.30-wasm-blob-tests.patch"
 )
 
 python_check_deps() {

[gentoo-commits] repo/proj/guru:dev commit in: dev-lang/wabt/files/, dev-lang/wabt/

[gentoo-commits] repo/proj/guru:dev commit in: dev-lang/wabt/files/, dev-lang/wabt/

2 matches

Site Navigation

Mail list logo

Footer information