diff --git a/.gitignore b/.gitignore index 7344718..583cdcc 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,13 @@ /wabt-1.0.33.tar.gz /wabt-testsuite-7ef86dd.tar.gz /wabt-wasm-c-api-b6dd1fb.tar.gz +/wabt-1.0.35.tar.gz +/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 6ed887a..dab7fb8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.33.tar.gz) = cf9069a09618ec81c83c3774aee4534149b6e9c53a502bab8786ff421fbe44e2774d2ff1566a62c013147ddb43286eaa70c6f62a6ca91ee0862329d2ab2730c2 -SHA512 (wabt-testsuite-7ef86dd.tar.gz) = b50b635aa6bbe66909453bd6ccb90bc8af3c7ed225500b5c189d8c77c48359708eae5fc6c0a42c7a42f7a8d697df20219f3b5e2c09473ff244373bd7a41315a8 +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-tests-i686.patch b/wabt-tests-i686.patch deleted file mode 100644 index 7b6e014..0000000 --- a/wabt-tests-i686.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up wabt-1.0.33/test/run-spec-wasm2c.py.i686 wabt-1.0.33/test/run-spec-wasm2c.py ---- wabt-1.0.33/test/run-spec-wasm2c.py.i686 2023-05-25 18:31:15.559577874 +0200 -+++ wabt-1.0.33/test/run-spec-wasm2c.py 2023-05-25 18:50:15.718494849 +0200 -@@ -459,6 +459,7 @@ def Compile(cc, c_filename, out_dir, *cf - # and '-frounding-math' to maintain conformance with the spec tests - # (GCC also requires '-fsignaling-nans') - args += ['-c', c_filename, '-o', o_filename, '-O2', -+ '-msse2', '-mfpmath=sse', - '-Wall', '-Werror', '-Wno-unused', - '-Wno-ignored-optimization-argument', - '-Wno-tautological-constant-out-of-range-compare', diff --git a/wabt-tests.patch b/wabt-tests.patch deleted file mode 100644 index cf2a4f0..0000000 --- a/wabt-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wabt-1.0.33/test/run-spec-wasm2c.py.orig wabt-1.0.33/test/run-spec-wasm2c.py ---- wabt-1.0.33/test/run-spec-wasm2c.py.orig 2023-05-12 21:56:46.000000000 +0000 -+++ wabt-1.0.33/test/run-spec-wasm2c.py 2023-05-25 16:32:29.360419741 +0000 -@@ -463,6 +463,8 @@ def Compile(cc, c_filename, out_dir, *cf - '-Wno-ignored-optimization-argument', - '-Wno-tautological-constant-out-of-range-compare', - '-Wno-infinite-recursion', -+ '-Wno-array-bounds', -+ '-Wbidi-chars=none', - '-fno-optimize-sibling-calls', - '-frounding-math', '-fsignaling-nans', - '-std=c99', '-D_DEFAULT_SOURCE'] diff --git a/wabt.spec b/wabt.spec index 4aae235..5c0d5e9 100644 --- a/wabt.spec +++ b/wabt.spec @@ -1,31 +1,30 @@ %undefine __cmake_in_source_build %bcond_without check -%global commit 3e8207aabe969098d2b4941142a1973008c63033 +%global commit ad75c5edcdff96d73c245b57fbc07607aaca9f95 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit 7ef86ddeed81458f9031a49a40b3a3f99c1c6a8a +%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.33 -Release: 2%{?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 -# https://github.com/WebAssembly/wabt/issues/1885 -Patch0: wabt-tests.patch -Patch1: wabt-tests-i686.patch -License: ASL 2.0 -BuildRequires: cmake3 +# increase test timeout to avoid failures +Patch0: %{name}-test-timeout.patch +License: Apache-2.0 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: openssl-devel %if %{with check} BuildRequires: gtest-devel BuildRequires: python%{python3_pkgversion}-ply -BuildRequires: simde-devel >= 0.7.4~rc4 +BuildRequires: simde-devel >= 0.8.2 %endif # wasm.h from https://github.com/WebAssembly/wasm-c-api/ is used for build Provides: bundled(wasm-c-api) = %{wc_commit} @@ -49,21 +48,11 @@ 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 .orig -%ifarch i686 -%patch 1 -p1 -b .i686 -%endif +%patch 0 -p1 -b .timeout pushd test -# https://github.com/WebAssembly/wabt/issues/2118 -# https://github.com/WebAssembly/wabt/issues/2240 -# https://bugzilla.redhat.com/show_bug.cgi?id=2210218 -%ifarch aarch64 -rm spec/relaxed-simd/relaxed_madd_nmadd.txt -rm wasm2c/spec/simd_address.txt -rm wasm2c/spec/simd_f32x4.txt -%endif # https://github.com/WebAssembly/wabt/issues/1044 %ifarch i686 +rm regress/empty-quoted-module.txt rm spec/float_exprs.txt rm spec/float_misc.txt rm spec/local_tee.txt @@ -79,80 +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/2118 # https://github.com/WebAssembly/wabt/issues/2240 %ifarch ppc64le rm spec/conversions.txt -rm spec/relaxed-simd/relaxed_madd_nmadd.txt rm spec/simd_conversions.txt -rm wasm2c/spec/conversions.txt +rm wasm2c/spec/memory64/simd_address.txt rm wasm2c/spec/simd_address.txt -rm wasm2c/spec/simd_bit_shift.txt rm wasm2c/spec/simd_f32x4_arith.txt rm wasm2c/spec/simd_f32x4_pmin_pmax.txt -rm wasm2c/spec/simd_f64x2_pmin_pmax.txt -rm wasm2c/spec/simd_i16x8_arith.txt rm wasm2c/spec/simd_splat.txt %endif -# https://github.com/WebAssembly/wabt/issues/2070 -# https://github.com/WebAssembly/wabt/issues/2118 -# https://github.com/WebAssembly/wabt/issues/2240 -%ifarch s390x -rm spec/relaxed-simd/relaxed_madd_nmadd.txt -rm wasm2c/spec/bulk.txt -rm wasm2c/spec/extended-const/data.txt -rm wasm2c/spec/memory_copy.txt -rm wasm2c/spec/memory_fill.txt -rm wasm2c/spec/memory_init.txt -rm wasm2c/spec/multi-memory/memory-multi.txt -rm wasm2c/spec/multi-memory/memory_copy0.txt -rm wasm2c/spec/multi-memory/memory_fill0.txt -rm wasm2c/spec/simd_address.txt -rm wasm2c/spec/simd_align.txt -rm wasm2c/spec/simd_const.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_cmp.txt -rm wasm2c/spec/simd_i16x8_sat_arith.txt -rm wasm2c/spec/simd_i32x4_arith.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_load8_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-multi-output/memory_init.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 -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 @@ -162,7 +108,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %{_bindir}/wasm-decompile %{_bindir}/wasm-interp %{_bindir}/wasm-objdump -%{_bindir}/wasm-opcodecnt +%{_bindir}/wasm-stats %{_bindir}/wasm-strip %{_bindir}/wasm-validate %{_bindir}/wasm2c @@ -181,7 +127,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %{_mandir}/man1/wasm-decompile.1* %{_mandir}/man1/wasm-interp.1* %{_mandir}/man1/wasm-objdump.1* -%{_mandir}/man1/wasm-opcodecnt.1* +%{_mandir}/man1/wasm-stats.1* %{_mandir}/man1/wasm-strip.1* %{_mandir}/man1/wasm-validate.1* %{_mandir}/man1/wasm2c.1* @@ -191,6 +137,59 @@ 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 +- fix some tests in i686 +- simde-0.8.2 is now required +- run all tests on aarch64, all issues resolved +- review skipped tests on i686, ppc64le and s390x + +* Wed Jul 24 2024 Miroslav Suchý - 1.0.33-5 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.0.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.0.33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.0.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild