diff --git a/.gitignore b/.gitignore index a16a15b..583cdcc 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,9 @@ /wabt-testsuite-0a394e3.tar.gz /wabt-1.0.36.tar.gz /wabt-testsuite-f3f0486.tar.gz +/wabt-1.0.37.tar.gz +/wabt-testsuite-cbc54d7.tar.gz +/wabt-1.0.39.tar.gz +/wabt-testsuite-d76759e.tar.gz +/wabt-1.0.40.tar.gz +/wabt-1.0.41.tar.gz diff --git a/sources b/sources index 73d6196..dab7fb8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.36.tar.gz) = 5b8c2b9cc7b96c0964a8c33fd13a3f0fdeb665598d6a55f47264f285f52f646865613b6745c20ebecb50f3358c454aaef6737a895bc64009c4ef06ef6ce14a7e -SHA512 (wabt-testsuite-f3f0486.tar.gz) = 7ea2b6bf91756640a204f86841aa7431f8370f995cd3effa88719df501f472de5d7cefc2621cdbbbfc156e9d1bbdedfa0fcd17b3ed02e319ad1af28d47ed393c +SHA512 (wabt-1.0.41.tar.gz) = afa21608c20e42b009ef4685b04a42bdaf087ffec7e5e6bc2d91a8ffd801cb54f5c67a06ad2ec4398dd190543146c79d41a444b0aa21112685d81fd192d8ffd5 +SHA512 (wabt-testsuite-d76759e.tar.gz) = fa5a6315098d2764e7170feeefaa8161ea5577769b98f4a4301e594e555dccb59395212a33585970509912ae08bb40478119e989894e60e0103acd52378837ea SHA512 (wabt-wasm-c-api-b6dd1fb.tar.gz) = 5d3eec2184f8b66e2358b85f416afaea172f24155a61c9412a9d9374aa50347cf0ebe940f35727bc8c0ffe287033b967cc97a857feab6aa9e5098458e72b4fd0 diff --git a/wabt-test-timeout.patch b/wabt-test-timeout.patch new file mode 100644 index 0000000..3777a43 --- /dev/null +++ b/wabt-test-timeout.patch @@ -0,0 +1,12 @@ +diff -up wabt-1.0.36/CMakeLists.txt.orig wabt-1.0.36/CMakeLists.txt +--- wabt-1.0.36/CMakeLists.txt.orig 2024-07-31 19:40:07.000000000 +0200 ++++ wabt-1.0.36/CMakeLists.txt 2025-02-21 09:56:15.768904412 +0100 +@@ -726,7 +726,7 @@ if (BUILD_TESTS) + set(RUN_TESTS_PY ${WABT_SOURCE_DIR}/test/run-tests.py) + + add_custom_target(run-tests +- COMMAND ${CMAKE_COMMAND} -E env WASM2C_CC=${CMAKE_C_COMPILER} WASM2C_CFLAGS=${WASM2C_CFLAGS} ${Python3_EXECUTABLE} ${RUN_TESTS_PY} --bindir $ ++ COMMAND ${CMAKE_COMMAND} -E env WASM2C_CC=${CMAKE_C_COMPILER} WASM2C_CFLAGS=${WASM2C_CFLAGS} ${Python3_EXECUTABLE} ${RUN_TESTS_PY} --bindir $ --timeout=1200 + DEPENDS ${WABT_EXECUTABLES} + WORKING_DIRECTORY ${WABT_SOURCE_DIR} + USES_TERMINAL diff --git a/wabt.spec b/wabt.spec index 9d4bd44..5c0d5e9 100644 --- a/wabt.spec +++ b/wabt.spec @@ -1,22 +1,24 @@ %undefine __cmake_in_source_build %bcond_without check -%global commit 3e826ecde1adfba5f88d10d361131405637e65a3 +%global commit ad75c5edcdff96d73c245b57fbc07607aaca9f95 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit f3f048661dc1686d556a27d522df901cb747ab4a +%global ts_commit d76759e746f3564a03f6106ae19679742f2a1831 %global ts_shortcommit %(c=%{ts_commit}; echo ${c:0:7}) %global wc_commit b6dd1fb658a282c64b029867845bc50ae59e1497 %global wc_shortcommit %(c=%{wc_commit}; echo ${c:0:7}) Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.36 -Release: 1%{?dist} +Version: 1.0.41 +Release: 3%{?dist} URL: https://github.com/WebAssembly/wabt Source0: https://github.com/WebAssembly/wabt/archive/%{version}/%{name}-%{version}.tar.gz Source1: https://github.com/WebAssembly/testsuite/archive/%{ts_commit}/%{name}-testsuite-%{ts_shortcommit}.tar.gz Source2: https://github.com/WebAssembly/wasm-c-api/archive/%{wc_commit}/%{name}-wasm-c-api-%{wc_shortcommit}.tar.gz +# increase test timeout to avoid failures +Patch0: %{name}-test-timeout.patch License: Apache-2.0 -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: openssl-devel %if %{with check} @@ -46,6 +48,7 @@ mv third_party/wasm-c-api{-%{wc_commit},} rmdir third_party/testsuite tar xzf %{S:1} -C third_party mv third_party/testsuite{-%{ts_commit},} +%patch 0 -p1 -b .timeout pushd test # https://github.com/WebAssembly/wabt/issues/1044 %ifarch i686 @@ -65,101 +68,37 @@ rm wasm2c/spec/local_tee.txt rm wasm2c/spec/memory64/float_memory64.txt rm wasm2c/spec/multi-memory/float_memory0.txt rm wasm2c/spec/select.txt +rm wast2json/test-invalid-quoted-modules.txt %endif # https://github.com/WebAssembly/wabt/issues/1045 # https://github.com/WebAssembly/wabt/issues/2240 %ifarch ppc64le rm spec/conversions.txt rm spec/simd_conversions.txt +rm wasm2c/spec/memory64/simd_address.txt rm wasm2c/spec/simd_address.txt rm wasm2c/spec/simd_f32x4_arith.txt rm wasm2c/spec/simd_f32x4_pmin_pmax.txt rm wasm2c/spec/simd_splat.txt %endif -# https://github.com/WebAssembly/wabt/issues/2070 -# https://github.com/WebAssembly/wabt/issues/2240 -%ifarch s390x -rm wasm2c/spec/address.txt -rm wasm2c/spec/endianness.txt -rm wasm2c/spec/exception-handling/imports.txt -rm wasm2c/spec/float_exprs.txt -rm wasm2c/spec/float_memory.txt -rm wasm2c/spec/imports.txt -rm wasm2c/spec/left-to-right.txt -rm wasm2c/spec/memory.txt -rm wasm2c/spec/memory_redundancy.txt -rm wasm2c/spec/memory_trap.txt -rm wasm2c/spec/memory64/address.txt -rm wasm2c/spec/memory64/address64.txt -rm wasm2c/spec/memory64/endianness64.txt -rm wasm2c/spec/memory64/float_memory64.txt -rm wasm2c/spec/memory64/memory.txt -rm wasm2c/spec/memory64/memory_redundancy64.txt -rm wasm2c/spec/memory64/memory_trap64.txt -rm wasm2c/spec/memory64/memory64.txt -rm wasm2c/spec/memory64/simd_address.txt -rm wasm2c/spec/multi-memory/address0.txt -rm wasm2c/spec/multi-memory/address1.txt -rm wasm2c/spec/multi-memory/float_exprs1.txt -rm wasm2c/spec/multi-memory/float_memory0.txt -rm wasm2c/spec/multi-memory/imports.txt -rm wasm2c/spec/multi-memory/imports1.txt -rm wasm2c/spec/multi-memory/imports2.txt -rm wasm2c/spec/multi-memory/load.txt -rm wasm2c/spec/multi-memory/load0.txt -rm wasm2c/spec/multi-memory/memory.txt -rm wasm2c/spec/multi-memory/memory-multi.txt -rm wasm2c/spec/multi-memory/memory_trap1.txt -rm wasm2c/spec/simd_address.txt -rm wasm2c/spec/simd_align.txt -rm wasm2c/spec/simd_const.txt -rm wasm2c/spec/simd_f32x4.txt -rm wasm2c/spec/simd_f32x4_arith.txt -rm wasm2c/spec/simd_f64x2.txt -rm wasm2c/spec/simd_f64x2_arith.txt -rm wasm2c/spec/simd_i16x8_arith.txt -rm wasm2c/spec/simd_i16x8_arith2.txt -rm wasm2c/spec/simd_i16x8_cmp.txt -rm wasm2c/spec/simd_i16x8_sat_arith.txt -rm wasm2c/spec/simd_i32x4_arith.txt -rm wasm2c/spec/simd_i32x4_arith2.txt -rm wasm2c/spec/simd_i32x4_cmp.txt -rm wasm2c/spec/simd_i64x2_arith.txt -rm wasm2c/spec/simd_i64x2_arith2.txt -rm wasm2c/spec/simd_i8x16_arith.txt -rm wasm2c/spec/simd_i8x16_cmp.txt -rm wasm2c/spec/simd_i8x16_sat_arith.txt -rm wasm2c/spec/simd_lane.txt -rm wasm2c/spec/simd_load.txt -rm wasm2c/spec/simd_load16_lane.txt -rm wasm2c/spec/simd_load32_lane.txt -rm wasm2c/spec/simd_load64_lane.txt -rm wasm2c/spec/simd_load_extend.txt -rm wasm2c/spec/simd_load_splat.txt -rm wasm2c/spec/simd_load_zero.txt -rm wasm2c/spec/simd_store.txt -rm wasm2c/spec/simd_store16_lane.txt -rm wasm2c/spec/simd_store32_lane.txt -rm wasm2c/spec/simd_store64_lane.txt -rm wasm2c/spec/simd_store8_lane.txt -rm wasm2c/spec/threads/atomic.txt -%endif popd %endif %build -%cmake3 -DUSE_SYSTEM_GTEST=ON -%cmake3_build +%cmake -DUSE_SYSTEM_GTEST=ON \ +%ifarch i686 + -DWASM2C_CFLAGS="-msse2 -mfpmath=sse" +%endif +%cmake_build %install -%cmake3_install +%cmake_install %if %{with check} %check -%ifarch i686 -export WASM2C_CFLAGS="-msse2 -mfpmath=sse" -%endif -test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} +# See https://github.com/WebAssembly/wabt/blob/main/.github/workflows/build.yml#L261 +cmake --build redhat-linux-build --verbose --target run-unittests %{?_smp_mflags} +cmake --build redhat-linux-build --verbose --target run-tests %{?_smp_mflags} %endif %files @@ -198,6 +137,42 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.0.41-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jun 13 2026 Yaakov Selkowitz - 1.0.41-2 +- Rebuilt for openssl 4.0 + +* Thu May 21 2026 Dominik Mierzejewski - 1.0.41-1 +- update to 1.0.41 (resolves rhbz#2467788) + +* Thu Apr 16 2026 Dominik Mierzejewski 1.0.40-1 +- update to 1.0.40 (resolves rhbz#2446432) +- stop using obsolete cmake3 macros + +* Sat Jan 17 2026 Fedora Release Engineering - 1.0.39-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Mon Nov 17 2025 Dominik Mierzejewski 1.0.39-1 +- update to 1.0.39 (resolves rhbz#2401391) + +* Fri Jul 25 2025 Fedora Release Engineering - 1.0.37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Mar 04 2025 Dominik Mierzejewski 1.0.37-1 +- update to 1.0.37 (resolves rhbz#2349655) +- skip new failing tests on i686 and ppc64le +- re-enable wasm2c/spec/float_exprs.txt test, now that GCC 15 is fixed + +* Fri Feb 21 2025 Dominik Mierzejewski 1.0.36-3 +- use upstream way of running tests +- run unit tests +- re-enable most tests on s390x now that they pass +- skip failing test on ppc64le and s390x with GCC 15 + +* Sun Jan 19 2025 Fedora Release Engineering - 1.0.36-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 09 2024 Dominik Mierzejewski 1.0.36-1 - update to 1.0.36 (#2246227) - drop obsolete patches