From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 935C6158095 for ; Tue, 4 Oct 2022 12:25:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3F01E0933; Tue, 4 Oct 2022 12:25:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A4ECE0933 for ; Tue, 4 Oct 2022 12:25:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7BD89340CB6 for ; Tue, 4 Oct 2022 12:25:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EACE45A0 for ; Tue, 4 Oct 2022 12:25:16 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1664851451.37e16f64f8bb38f72a2271c8a01229cfdb746dfe.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-lang/wabt/files/, dev-lang/wabt/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch dev-lang/wabt/wabt-1.0.29.ebuild X-VCS-Directories: dev-lang/wabt/files/ dev-lang/wabt/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 37e16f64f8bb38f72a2271c8a01229cfdb746dfe X-VCS-Branch: master Date: Tue, 4 Oct 2022 12:25:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ecf1bd1a-acb5-49bb-a27c-1e4509f1726e X-Archives-Hash: 72890883a819c0de699dff2b51e4881c commit: 37e16f64f8bb38f72a2271c8a01229cfdb746dfe Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Tue Oct 4 02:23:02 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Oct 4 02:44:11 2022 +0000 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 000000000..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 }