From 584973c1be052cf2a9890ecc0b25abf708d652e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:43:30 +0000 Subject: [PATCH 01/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index a1db44a..a5831d6 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.23 -Release: 1%{?dist} +Release: 2%{?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 @@ -125,6 +125,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.0.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri May 14 2021 Dominik Mierzejewski 1.0.23-1 - update to 1.0.23 (#1934466) - drop obsolete patch From 91a57707f612f6191254971b5fadb2804a36d3c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:14:24 +0000 Subject: [PATCH 02/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index ebc8d6f..cf8b30a 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.24 -Release: 1%{?dist} +Release: 2%{?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 @@ -114,6 +114,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.0.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 20 2021 Dominik Mierzejewski 1.0.24-1 - update to 1.0.24 (#1993479) - enable skipped tests on s390x (fixed upstream) From 78a5a3cf53a5cf7cab0b129f30eaa77f47e93ae5 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 7 Feb 2022 15:42:38 +0100 Subject: [PATCH 03/42] update to 1.0.25 (#2047107) --- .gitignore | 2 ++ sources | 4 ++-- wabt.spec | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 797a8f7..9393813 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /wabt-testsuite-9994915.tar.gz /wabt-1.0.24.tar.gz /wabt-testsuite-01efde8.tar.gz +/wabt-1.0.25.tar.gz +/wabt-testsuite-6241ce9.tar.gz diff --git a/sources b/sources index 7becfb5..f9a302e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.24.tar.gz) = 6257702f06baace7eded7fd4890cbf23e533f20ee6c40de82a7a4cd32fe931a49efd3cbfc1355c4da49e6fbd3b62b1cf05edf1699313840d4825a2165a3928a8 -SHA512 (wabt-testsuite-01efde8.tar.gz) = 549c2e13ebbd7d87013426d8cdeaa0a6177928307b688e1b90026e79683f7964f09dfb47294b34ba9190d0f3acb279f6d0a924e1f1a9112fc9d89637b8cb9efd +SHA512 (wabt-1.0.25.tar.gz) = 462c52641da05d48b948931fdbd52d4aa27fe537d2556df1beec2313e3e2e789249b06018a4d2e777f1f0a4b1bf02cbc45ee3dbd77c26e489778c4e2a8dad827 +SHA512 (wabt-testsuite-6241ce9.tar.gz) = 5375b2412900af48a5eab6393b8471f2a76495f994aa5af40b160cb01c9f41638e4c2269d898cbcfd9068add7dffb6ab790c949b37e1dc8f6babed7a79705d6e SHA512 (wabt-wasm-c-api-d9a8009.tar.gz) = b6ee7d2d83a3ca7b3cb3ee110282f7d32eada1d9020cadd3fdec58f40478879fd9ac9fada526021d8f6e8a26e1df7353df313d4149be2ffe4aea3a28f856fd89 diff --git a/wabt.spec b/wabt.spec index 2610d9a..c8f25f5 100644 --- a/wabt.spec +++ b/wabt.spec @@ -1,15 +1,15 @@ %undefine __cmake_in_source_build %bcond_without check -%global commit 21279a861fa3dbac9af9d2bab16c741df17a86af +%global commit b3f1efb261b059d40a4d103c803ccbe3c32df7ae %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit 01efde81028c5b0d099eb836645a2dc5e7755449 +%global ts_commit 6241ce9e153e83ae281998ea8c9f54fe7748ee7c %global ts_shortcommit %(c=%{ts_commit}; echo ${c:0:7}) %global wc_commit d9a80099d496b5cdba6f3fe8fc77586e0e505ddc %global wc_shortcommit %(c=%{wc_commit}; echo ${c:0:7}) Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.24 +Version: 1.0.25 Release: 1%{?dist} URL: https://github.com/WebAssembly/wabt Source0: https://github.com/WebAssembly/wabt/archive/%{version}/%{name}-%{version}.tar.gz @@ -114,6 +114,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Mon Feb 07 2022 Dominik Mierzejewski 1.0.25-1 +- update to 1.0.25 (#2047107) + * Fri Aug 20 2021 Dominik Mierzejewski 1.0.24-1 - update to 1.0.24 (#1993479) - enable skipped tests on s390x (fixed upstream) From f9b0c27b4b4fee55ebf8f107acb217ae292fecf8 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 7 Feb 2022 22:58:11 +0100 Subject: [PATCH 04/42] skip some new failing tests on 32-bit --- wabt.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/wabt.spec b/wabt.spec index c8f25f5..cec7b9a 100644 --- a/wabt.spec +++ b/wabt.spec @@ -46,15 +46,23 @@ mv third_party/wasm-c-api{-%{wc_commit},} pushd test # https://github.com/WebAssembly/wabt/issues/1365 %ifarch armv7hl +rm dump/reference-types.txt +rm dump/relocations-all-features.txt +rm dump/relocations.txt +rm dump/table.txt rm wasm2c/spec/skip-stack-guard-page.txt %endif # https://github.com/WebAssembly/wabt/issues/1044 %ifarch i686 +rm dump/reference-types.txt +rm dump/relocations-all-features.txt +rm dump/relocations.txt +rm dump/table.txt rm spec/float_misc.txt -rm spec/simd/simd_f32x4_arith.txt -rm spec/simd/simd_f32x4_pmin_pmax.txt -rm spec/simd/simd_f64x2_arith.txt -rm spec/simd/simd_f64x2_pmin_pmax.txt +rm spec/simd_f32x4_arith.txt +rm spec/simd_f32x4_pmin_pmax.txt +rm spec/simd_f64x2_arith.txt +rm spec/simd_f64x2_pmin_pmax.txt rm wasm2c/spec/conversions.txt rm wasm2c/spec/float_literals.txt rm wasm2c/spec/float_memory.txt @@ -64,7 +72,7 @@ rm wasm2c/spec/float_exprs.txt # https://github.com/WebAssembly/wabt/issues/1045 %ifarch ppc64le rm spec/conversions.txt -rm spec/simd/simd_conversions.txt +rm spec/simd_conversions.txt rm wasm2c/spec/conversions.txt %endif popd @@ -116,6 +124,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %changelog * Mon Feb 07 2022 Dominik Mierzejewski 1.0.25-1 - update to 1.0.25 (#2047107) +- skip some new failing tests on 32-bit * Fri Aug 20 2021 Dominik Mierzejewski 1.0.24-1 - update to 1.0.24 (#1993479) From 34e7eaea85c2332717ec5022b76695f871f66caa Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 8 Feb 2022 00:38:03 +0100 Subject: [PATCH 05/42] skip two more failing tests on i686 --- wabt.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wabt.spec b/wabt.spec index d91c1d0..6b0647b 100644 --- a/wabt.spec +++ b/wabt.spec @@ -58,7 +58,9 @@ rm dump/reference-types.txt rm dump/relocations-all-features.txt rm dump/relocations.txt rm dump/table.txt +rm spec/float_exprs.txt rm spec/float_misc.txt +rm spec/local_tee.txt rm spec/simd_f32x4_arith.txt rm spec/simd_f32x4_pmin_pmax.txt rm spec/simd_f64x2_arith.txt @@ -125,6 +127,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} * Mon Feb 07 2022 Dominik Mierzejewski 1.0.25-1 - update to 1.0.25 (#2047107) - skip some new failing tests on 32-bit +- skip two more failing tests on i686 * Sat Jan 22 2022 Fedora Release Engineering - 1.0.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 44bc948d9692de7d62df7d4d110772406d0443bb Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 15 Mar 2022 15:50:17 +0100 Subject: [PATCH 06/42] update to 1.0.27 (#2055947) --- .gitignore | 2 ++ sources | 4 ++-- wabt.spec | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9393813..ac282c8 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /wabt-testsuite-01efde8.tar.gz /wabt-1.0.25.tar.gz /wabt-testsuite-6241ce9.tar.gz +/wabt-1.0.27.tar.gz +/wabt-testsuite-2c235ce.tar.gz diff --git a/sources b/sources index f9a302e..071bdbf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.25.tar.gz) = 462c52641da05d48b948931fdbd52d4aa27fe537d2556df1beec2313e3e2e789249b06018a4d2e777f1f0a4b1bf02cbc45ee3dbd77c26e489778c4e2a8dad827 -SHA512 (wabt-testsuite-6241ce9.tar.gz) = 5375b2412900af48a5eab6393b8471f2a76495f994aa5af40b160cb01c9f41638e4c2269d898cbcfd9068add7dffb6ab790c949b37e1dc8f6babed7a79705d6e +SHA512 (wabt-1.0.27.tar.gz) = adee96380867adaf17388d329bcef64df77eff59ca86e0346ac266b0575f4fd0195161cc3707bd1a31bcce713f106e873a619a357265b363f368eca5513b2986 +SHA512 (wabt-testsuite-2c235ce.tar.gz) = faf919323263641e356f856dc2562c032130e4f362588c1a2b86f24bee271364dbb7df339af13e6b36d80892edfe649181e79449a4df9e25b9f6e3003b47934c SHA512 (wabt-wasm-c-api-d9a8009.tar.gz) = b6ee7d2d83a3ca7b3cb3ee110282f7d32eada1d9020cadd3fdec58f40478879fd9ac9fada526021d8f6e8a26e1df7353df313d4149be2ffe4aea3a28f856fd89 diff --git a/wabt.spec b/wabt.spec index 6b0647b..c0786eb 100644 --- a/wabt.spec +++ b/wabt.spec @@ -1,15 +1,15 @@ %undefine __cmake_in_source_build %bcond_without check -%global commit b3f1efb261b059d40a4d103c803ccbe3c32df7ae +%global commit 3e8207aabe969098d2b4941142a1973008c63033 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit 6241ce9e153e83ae281998ea8c9f54fe7748ee7c +%global ts_commit 2c235ce09eca72ffcae73102c35cbc35226fb30c %global ts_shortcommit %(c=%{ts_commit}; echo ${c:0:7}) %global wc_commit d9a80099d496b5cdba6f3fe8fc77586e0e505ddc %global wc_shortcommit %(c=%{wc_commit}; echo ${c:0:7}) Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.25 +Version: 1.0.27 Release: 1%{?dist} URL: https://github.com/WebAssembly/wabt Source0: https://github.com/WebAssembly/wabt/archive/%{version}/%{name}-%{version}.tar.gz @@ -124,6 +124,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Tue Mar 15 2022 Dominik Mierzejewski 1.0.27-1 +- update to 1.0.27 (#2055947) + * Mon Feb 07 2022 Dominik Mierzejewski 1.0.25-1 - update to 1.0.25 (#2047107) - skip some new failing tests on 32-bit From f94bf81ce185631cef65d5f51ff717aef477bc8f Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 16 Mar 2022 08:35:33 +0100 Subject: [PATCH 07/42] drop armv7hl --- wabt.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/wabt.spec b/wabt.spec index c0786eb..dc5eb1a 100644 --- a/wabt.spec +++ b/wabt.spec @@ -44,14 +44,6 @@ mv third_party/testsuite{-%{ts_commit},} tar xzf %{S:2} -C third_party mv third_party/wasm-c-api{-%{wc_commit},} pushd test -# https://github.com/WebAssembly/wabt/issues/1365 -%ifarch armv7hl -rm dump/reference-types.txt -rm dump/relocations-all-features.txt -rm dump/relocations.txt -rm dump/table.txt -rm wasm2c/spec/skip-stack-guard-page.txt -%endif # https://github.com/WebAssembly/wabt/issues/1044 %ifarch i686 rm dump/reference-types.txt @@ -126,6 +118,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %changelog * Tue Mar 15 2022 Dominik Mierzejewski 1.0.27-1 - update to 1.0.27 (#2055947) +- drop armv7hl * Mon Feb 07 2022 Dominik Mierzejewski 1.0.25-1 - update to 1.0.25 (#2047107) From b4196b77b8e12064fa300c8416b8bd84fa4903bb Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 4 Apr 2022 13:15:20 +0200 Subject: [PATCH 08/42] update to 1.0.28 (#2065997) --- .gitignore | 2 ++ sources | 4 ++-- wabt.spec | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9393813..b641b7a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /wabt-testsuite-01efde8.tar.gz /wabt-1.0.25.tar.gz /wabt-testsuite-6241ce9.tar.gz +/wabt-1.0.28.tar.gz +/wabt-testsuite-2c235ce.tar.gz diff --git a/sources b/sources index f9a302e..5da7563 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.25.tar.gz) = 462c52641da05d48b948931fdbd52d4aa27fe537d2556df1beec2313e3e2e789249b06018a4d2e777f1f0a4b1bf02cbc45ee3dbd77c26e489778c4e2a8dad827 -SHA512 (wabt-testsuite-6241ce9.tar.gz) = 5375b2412900af48a5eab6393b8471f2a76495f994aa5af40b160cb01c9f41638e4c2269d898cbcfd9068add7dffb6ab790c949b37e1dc8f6babed7a79705d6e +SHA512 (wabt-1.0.28.tar.gz) = 498c60309684cab930616feea2d7834c8ab95b5fd7cf2ab2cca4ae7ff5bb6b45e22472663822645ef5a3e2053f9491f2e6eeb153e30a6ee1f28a20bb833b6c3a +SHA512 (wabt-testsuite-2c235ce.tar.gz) = faf919323263641e356f856dc2562c032130e4f362588c1a2b86f24bee271364dbb7df339af13e6b36d80892edfe649181e79449a4df9e25b9f6e3003b47934c SHA512 (wabt-wasm-c-api-d9a8009.tar.gz) = b6ee7d2d83a3ca7b3cb3ee110282f7d32eada1d9020cadd3fdec58f40478879fd9ac9fada526021d8f6e8a26e1df7353df313d4149be2ffe4aea3a28f856fd89 diff --git a/wabt.spec b/wabt.spec index 1b42805..3bd9492 100644 --- a/wabt.spec +++ b/wabt.spec @@ -2,14 +2,14 @@ %bcond_without check %global commit b3f1efb261b059d40a4d103c803ccbe3c32df7ae %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit 6241ce9e153e83ae281998ea8c9f54fe7748ee7c +%global ts_commit 2c235ce09eca72ffcae73102c35cbc35226fb30c %global ts_shortcommit %(c=%{ts_commit}; echo ${c:0:7}) %global wc_commit d9a80099d496b5cdba6f3fe8fc77586e0e505ddc %global wc_shortcommit %(c=%{wc_commit}; echo ${c:0:7}) Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.25 +Version: 1.0.28 Release: 1%{?dist} URL: https://github.com/WebAssembly/wabt Source0: https://github.com/WebAssembly/wabt/archive/%{version}/%{name}-%{version}.tar.gz @@ -122,6 +122,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Fri Apr 01 2022 Dominik Mierzejewski 1.0.28-1 +- update to 1.0.28 (#2065997) + * Mon Feb 07 2022 Dominik Mierzejewski 1.0.25-1 - update to 1.0.25 (#2047107) - skip some new failing tests on 32-bit From ae255b85d48b50ac3d12c44958c112c9529af4f6 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 4 Apr 2022 13:17:02 +0200 Subject: [PATCH 09/42] run fixed tests on 32-bit again https://github.com/WebAssembly/wabt/issues/1822 was fixed upstream. --- wabt.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/wabt.spec b/wabt.spec index 3bd9492..4db935d 100644 --- a/wabt.spec +++ b/wabt.spec @@ -46,18 +46,10 @@ mv third_party/wasm-c-api{-%{wc_commit},} pushd test # https://github.com/WebAssembly/wabt/issues/1365 %ifarch armv7hl -rm dump/reference-types.txt -rm dump/relocations-all-features.txt -rm dump/relocations.txt -rm dump/table.txt rm wasm2c/spec/skip-stack-guard-page.txt %endif # https://github.com/WebAssembly/wabt/issues/1044 %ifarch i686 -rm dump/reference-types.txt -rm dump/relocations-all-features.txt -rm dump/relocations.txt -rm dump/table.txt rm spec/float_misc.txt rm spec/simd_f32x4_arith.txt rm spec/simd_f32x4_pmin_pmax.txt @@ -124,6 +116,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %changelog * Fri Apr 01 2022 Dominik Mierzejewski 1.0.28-1 - update to 1.0.28 (#2065997) +- run fixed tests on 32-bit again * Mon Feb 07 2022 Dominik Mierzejewski 1.0.25-1 - update to 1.0.25 (#2047107) From 72c7d3d0716967ea8df2e535a616b0a9fdeb7204 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 4 Apr 2022 10:39:18 +0200 Subject: [PATCH 10/42] work around test failures due to new gcc-12 warnings --- wabt-tests.patch | 11 +++++++++++ wabt.spec | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 wabt-tests.patch diff --git a/wabt-tests.patch b/wabt-tests.patch new file mode 100644 index 0000000..afc57a7 --- /dev/null +++ b/wabt-tests.patch @@ -0,0 +1,11 @@ +diff -up wabt-1.0.28/test/run-spec-wasm2c.py.orig wabt-1.0.28/test/run-spec-wasm2c.py +--- wabt-1.0.28/test/run-spec-wasm2c.py.orig 2022-03-18 21:35:31.000000000 +0100 ++++ wabt-1.0.28/test/run-spec-wasm2c.py 2022-04-04 09:58:00.473884298 +0200 +@@ -350,6 +350,7 @@ def Compile(cc, c_filename, out_dir, *ar + args += ['-c', c_filename, '-o', o_filename, + '-Wall', '-Werror', '-Wno-unused', + '-Wno-tautological-constant-out-of-range-compare', ++ '-Wno-infinite-recursion', '-Wbidi-chars=none', + '-std=c99', '-D_DEFAULT_SOURCE'] + # Use RunWithArgsForStdout and discard stdout because cl.exe + # unconditionally prints the name of input files on stdout diff --git a/wabt.spec b/wabt.spec index d01056c..a317dd0 100644 --- a/wabt.spec +++ b/wabt.spec @@ -15,6 +15,8 @@ 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 License: ASL 2.0 BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -43,6 +45,7 @@ tar xzf %{S:1} -C third_party mv third_party/testsuite{-%{ts_commit},} tar xzf %{S:2} -C third_party mv third_party/wasm-c-api{-%{wc_commit},} +%patch0 -p1 -b .orig pushd test # https://github.com/WebAssembly/wabt/issues/1365 %ifarch armv7hl @@ -119,6 +122,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} * Fri Apr 01 2022 Dominik Mierzejewski 1.0.28-1 - update to 1.0.28 (#2065997) - run fixed tests on 32-bit again +- work around test failures due to new gcc-12 warnings * Tue Mar 15 2022 Dominik Mierzejewski 1.0.27-1 - update to 1.0.27 (#2055947) From d0c32ab97a924cb8fc2aecc701103ecd4ee1b9fb Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 25 May 2022 12:09:50 +0200 Subject: [PATCH 11/42] update to 1.0.29 --- .gitignore | 2 ++ sources | 4 ++-- wabt.spec | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b641b7a..8ff5533 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ /wabt-testsuite-6241ce9.tar.gz /wabt-1.0.28.tar.gz /wabt-testsuite-2c235ce.tar.gz +/wabt-1.0.29.tar.gz +/wabt-testsuite-d42da01.tar.gz diff --git a/sources b/sources index 5da7563..4e33604 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.28.tar.gz) = 498c60309684cab930616feea2d7834c8ab95b5fd7cf2ab2cca4ae7ff5bb6b45e22472663822645ef5a3e2053f9491f2e6eeb153e30a6ee1f28a20bb833b6c3a -SHA512 (wabt-testsuite-2c235ce.tar.gz) = faf919323263641e356f856dc2562c032130e4f362588c1a2b86f24bee271364dbb7df339af13e6b36d80892edfe649181e79449a4df9e25b9f6e3003b47934c +SHA512 (wabt-1.0.29.tar.gz) = 7783e16c848da76392cd9f35aa1d205872d3d42e6aea1a815b28df3373cd547d2f139df4899de495bb6ee753c7c0bd608adc35538c2d3eb7325498457d6b3e08 +SHA512 (wabt-testsuite-d42da01.tar.gz) = 58fb712e2de398d471de3ef31560331f8f61e77012eca42ccd140589e9284071ee475e35516af1c12985dddf32ecc7ffa3727dfb855da87bb6ec7c1f78e7b944 SHA512 (wabt-wasm-c-api-d9a8009.tar.gz) = b6ee7d2d83a3ca7b3cb3ee110282f7d32eada1d9020cadd3fdec58f40478879fd9ac9fada526021d8f6e8a26e1df7353df313d4149be2ffe4aea3a28f856fd89 diff --git a/wabt.spec b/wabt.spec index 4db935d..4821697 100644 --- a/wabt.spec +++ b/wabt.spec @@ -2,14 +2,14 @@ %bcond_without check %global commit b3f1efb261b059d40a4d103c803ccbe3c32df7ae %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit 2c235ce09eca72ffcae73102c35cbc35226fb30c +%global ts_commit d42da0117f7a93c6a9127e2b9eec64749152c4c1 %global ts_shortcommit %(c=%{ts_commit}; echo ${c:0:7}) %global wc_commit d9a80099d496b5cdba6f3fe8fc77586e0e505ddc %global wc_shortcommit %(c=%{wc_commit}; echo ${c:0:7}) Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.28 +Version: 1.0.29 Release: 1%{?dist} URL: https://github.com/WebAssembly/wabt Source0: https://github.com/WebAssembly/wabt/archive/%{version}/%{name}-%{version}.tar.gz @@ -114,6 +114,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Wed May 25 2022 Dominik Mierzejewski 1.0.29-1 +- update to 1.0.29 + * Fri Apr 01 2022 Dominik Mierzejewski 1.0.28-1 - update to 1.0.28 (#2065997) - run fixed tests on 32-bit again From 5fd52cc6e6537170e5a00db628cea18c0ad47c38 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 25 May 2022 12:27:57 +0200 Subject: [PATCH 12/42] update tests patch --- wabt-tests.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wabt-tests.patch b/wabt-tests.patch index afc57a7..6a7a812 100644 --- a/wabt-tests.patch +++ b/wabt-tests.patch @@ -1,10 +1,11 @@ -diff -up wabt-1.0.28/test/run-spec-wasm2c.py.orig wabt-1.0.28/test/run-spec-wasm2c.py ---- wabt-1.0.28/test/run-spec-wasm2c.py.orig 2022-03-18 21:35:31.000000000 +0100 -+++ wabt-1.0.28/test/run-spec-wasm2c.py 2022-04-04 09:58:00.473884298 +0200 -@@ -350,6 +350,7 @@ def Compile(cc, c_filename, out_dir, *ar +diff -up wabt-1.0.29/test/run-spec-wasm2c.py.orig wabt-1.0.29/test/run-spec-wasm2c.py +--- wabt-1.0.29/test/run-spec-wasm2c.py.orig 2022-05-25 12:11:37.072583265 +0200 ++++ wabt-1.0.29/test/run-spec-wasm2c.py 2022-05-25 12:26:45.817799510 +0200 +@@ -344,7 +344,7 @@ def Compile(cc, c_filename, out_dir, *ar args += ['-c', c_filename, '-o', o_filename, '-Wall', '-Werror', '-Wno-unused', '-Wno-tautological-constant-out-of-range-compare', +- '-Wno-infinite-recursion', + '-Wno-infinite-recursion', '-Wbidi-chars=none', '-std=c99', '-D_DEFAULT_SOURCE'] # Use RunWithArgsForStdout and discard stdout because cl.exe From 164657a2c8927dbfadfc532dd009129ac1c10585 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:10:23 +0000 Subject: [PATCH 13/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index 0763850..0c22ff6 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.29 -Release: 1%{?dist} +Release: 2%{?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 @@ -115,6 +115,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.0.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed May 25 2022 Dominik Mierzejewski 1.0.29-1 - update to 1.0.29 From c48c1c9b20a340513087222485cd3e0089f14aa2 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 16 Oct 2022 01:24:45 +0200 Subject: [PATCH 14/42] update to 1.0.30 (#2132095) --- .gitignore | 2 ++ sources | 4 ++-- wabt-tests.patch | 20 ++++++++++---------- wabt.spec | 10 ++++++++-- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 8cec96b..d9778d9 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /wabt-testsuite-2c235ce.tar.gz /wabt-1.0.29.tar.gz /wabt-testsuite-d42da01.tar.gz +/wabt-1.0.30.tar.gz +/wabt-testsuite-4f77306.tar.gz diff --git a/sources b/sources index 4e33604..164d028 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.29.tar.gz) = 7783e16c848da76392cd9f35aa1d205872d3d42e6aea1a815b28df3373cd547d2f139df4899de495bb6ee753c7c0bd608adc35538c2d3eb7325498457d6b3e08 -SHA512 (wabt-testsuite-d42da01.tar.gz) = 58fb712e2de398d471de3ef31560331f8f61e77012eca42ccd140589e9284071ee475e35516af1c12985dddf32ecc7ffa3727dfb855da87bb6ec7c1f78e7b944 +SHA512 (wabt-1.0.30.tar.gz) = 0b6a2c48d3f8772eb6e125a52d69062fa4f87c31991c8cc088a8667639d00e7772d38f743c867a53169f3ce689143ca53c6e5c1d33da28d283717238314d3895 +SHA512 (wabt-testsuite-4f77306.tar.gz) = 858de5e5aecc8c988160bdb4353e1b070e4dbeb782ddf82047c6e2abaecdb19a7c6d18d9b1b6e86ca6084a5326ea8dfd07389ce6c6d8ffbeae4b97d7e6d72b73 SHA512 (wabt-wasm-c-api-d9a8009.tar.gz) = b6ee7d2d83a3ca7b3cb3ee110282f7d32eada1d9020cadd3fdec58f40478879fd9ac9fada526021d8f6e8a26e1df7353df313d4149be2ffe4aea3a28f856fd89 diff --git a/wabt-tests.patch b/wabt-tests.patch index 6a7a812..c44041f 100644 --- a/wabt-tests.patch +++ b/wabt-tests.patch @@ -1,12 +1,12 @@ -diff -up wabt-1.0.29/test/run-spec-wasm2c.py.orig wabt-1.0.29/test/run-spec-wasm2c.py ---- wabt-1.0.29/test/run-spec-wasm2c.py.orig 2022-05-25 12:11:37.072583265 +0200 -+++ wabt-1.0.29/test/run-spec-wasm2c.py 2022-05-25 12:26:45.817799510 +0200 -@@ -344,7 +344,7 @@ def Compile(cc, c_filename, out_dir, *ar - args += ['-c', c_filename, '-o', o_filename, - '-Wall', '-Werror', '-Wno-unused', +diff -up wabt-1.0.30/test/run-spec-wasm2c.py.orig wabt-1.0.30/test/run-spec-wasm2c.py +--- wabt-1.0.30/test/run-spec-wasm2c.py.orig 2022-09-30 23:24:30.000000000 +0200 ++++ wabt-1.0.30/test/run-spec-wasm2c.py 2022-10-16 01:36:24.656799647 +0200 +@@ -391,6 +391,8 @@ def Compile(cc, c_filename, out_dir, *ar + '-Wno-ignored-optimization-argument', '-Wno-tautological-constant-out-of-range-compare', -- '-Wno-infinite-recursion', -+ '-Wno-infinite-recursion', '-Wbidi-chars=none', + '-Wno-infinite-recursion', ++ '-Wno-array-bounds', ++ '-Wbidi-chars=none', + '-fno-optimize-sibling-calls', + '-frounding-math', '-fsignaling-nans', '-std=c99', '-D_DEFAULT_SOURCE'] - # Use RunWithArgsForStdout and discard stdout because cl.exe - # unconditionally prints the name of input files on stdout diff --git a/wabt.spec b/wabt.spec index b48891b..ec81ccc 100644 --- a/wabt.spec +++ b/wabt.spec @@ -2,14 +2,14 @@ %bcond_without check %global commit 3e8207aabe969098d2b4941142a1973008c63033 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit d42da0117f7a93c6a9127e2b9eec64749152c4c1 +%global ts_commit 4f77306bb63151631d84f58dedf67958eb9911b9 %global ts_shortcommit %(c=%{ts_commit}; echo ${c:0:7}) %global wc_commit d9a80099d496b5cdba6f3fe8fc77586e0e505ddc %global wc_shortcommit %(c=%{wc_commit}; echo ${c:0:7}) Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.29 +Version: 1.0.30 Release: 1%{?dist} URL: https://github.com/WebAssembly/wabt Source0: https://github.com/WebAssembly/wabt/archive/%{version}/%{name}-%{version}.tar.gz @@ -102,8 +102,11 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %{_bindir}/wast2json %{_bindir}/wat-desugar %{_bindir}/wat2wasm +%{_includedir}/wabt %{_includedir}/wasm-rt-impl.h %{_includedir}/wasm-rt.h +%{_libdir}/cmake/wabt +%{_libdir}/libwabt.a %{_libdir}/libwasm-rt-impl.a %{_mandir}/man1/spectest-interp.1* %{_mandir}/man1/wasm-decompile.1* @@ -119,6 +122,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Sat Oct 15 2022 Dominik Mierzejewski 1.0.30-1 +- update to 1.0.30 (#2132095) + * Wed May 25 2022 Dominik Mierzejewski 1.0.29-1 - update to 1.0.29 From 078c7573a21693dda56ab399efa1532f1bd36185 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 15 Nov 2022 20:04:30 +0100 Subject: [PATCH 15/42] increase timeout to fix tests on ARM --- wabt.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index ec81ccc..dc6d140 100644 --- a/wabt.spec +++ b/wabt.spec @@ -84,7 +84,7 @@ popd %if %{with check} %check -test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} +test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} %endif %files @@ -124,6 +124,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags} %changelog * Sat Oct 15 2022 Dominik Mierzejewski 1.0.30-1 - update to 1.0.30 (#2132095) +- increase timeout to fix tests on ARM * Wed May 25 2022 Dominik Mierzejewski 1.0.29-1 - update to 1.0.29 From 56b222fb7a73ccf6623c812344bd90d53e06c3f2 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Wed, 16 Nov 2022 13:32:58 +0100 Subject: [PATCH 16/42] skip some new failing tests on i686 and s390x for now --- wabt.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/wabt.spec b/wabt.spec index dc6d140..38b5a9a 100644 --- a/wabt.spec +++ b/wabt.spec @@ -60,11 +60,13 @@ rm spec/simd_f32x4_arith.txt rm spec/simd_f32x4_pmin_pmax.txt rm spec/simd_f64x2_arith.txt rm spec/simd_f64x2_pmin_pmax.txt +rm wasm2c/old-spec/select.txt rm wasm2c/spec/conversions.txt rm wasm2c/spec/float_literals.txt rm wasm2c/spec/float_memory.txt rm wasm2c/spec/float_misc.txt rm wasm2c/spec/float_exprs.txt +rm wasm2c/spec/local_tee.txt %endif # https://github.com/WebAssembly/wabt/issues/1045 %ifarch ppc64le @@ -72,6 +74,13 @@ rm spec/conversions.txt rm spec/simd_conversions.txt rm wasm2c/spec/conversions.txt %endif +# https://github.com/WebAssembly/wabt/issues/2070 +%ifarch s390x +rm wasm2c/spec/bulk.txt +rm wasm2c/spec/memory_copy.txt +rm wasm2c/spec/memory_fill.txt +rm wasm2c/spec/memory_init.txt +%endif popd %endif @@ -125,6 +134,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} * Sat Oct 15 2022 Dominik Mierzejewski 1.0.30-1 - update to 1.0.30 (#2132095) - increase timeout to fix tests on ARM +- skip some new failing tests on i686 and s390x for now * Wed May 25 2022 Dominik Mierzejewski 1.0.29-1 - update to 1.0.29 From 02041136a9d18af0b7e57a9d48faa1ad7bd44a42 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 11 Dec 2022 22:47:55 +0100 Subject: [PATCH 17/42] update to 1.0.31 (#2143772) fix build on 32-bit --- .gitignore | 2 ++ sources | 4 ++-- wabt-32bit.patch | 12 ++++++++++++ wabt.spec | 15 +++++++++++---- 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 wabt-32bit.patch diff --git a/.gitignore b/.gitignore index d9778d9..56f4104 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /wabt-testsuite-d42da01.tar.gz /wabt-1.0.30.tar.gz /wabt-testsuite-4f77306.tar.gz +/wabt-1.0.31.tar.gz +/wabt-testsuite-3a04b2c.tar.gz diff --git a/sources b/sources index 164d028..00d275d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.30.tar.gz) = 0b6a2c48d3f8772eb6e125a52d69062fa4f87c31991c8cc088a8667639d00e7772d38f743c867a53169f3ce689143ca53c6e5c1d33da28d283717238314d3895 -SHA512 (wabt-testsuite-4f77306.tar.gz) = 858de5e5aecc8c988160bdb4353e1b070e4dbeb782ddf82047c6e2abaecdb19a7c6d18d9b1b6e86ca6084a5326ea8dfd07389ce6c6d8ffbeae4b97d7e6d72b73 +SHA512 (wabt-1.0.31.tar.gz) = 5e6e81be8d2f006b151357c6da9a201d109bea53a66468f80e77184306bbc88d40118d58d19f0582e98f5d7ad61f1dfbe2486ff9a0734454b2d459d2130d8bf3 +SHA512 (wabt-testsuite-3a04b2c.tar.gz) = 4af272082c755d2cc5a5156137ac76dc2496c5eee46fe6a7b58cb795daf59a02398aed224cf9cd48de4bc74d3a7eec81ee4f94d789be6ff879d665578a369040 SHA512 (wabt-wasm-c-api-d9a8009.tar.gz) = b6ee7d2d83a3ca7b3cb3ee110282f7d32eada1d9020cadd3fdec58f40478879fd9ac9fada526021d8f6e8a26e1df7353df313d4149be2ffe4aea3a28f856fd89 diff --git a/wabt-32bit.patch b/wabt-32bit.patch new file mode 100644 index 0000000..fe7e5fa --- /dev/null +++ b/wabt-32bit.patch @@ -0,0 +1,12 @@ +diff -up wabt-1.0.31/test/spec-wasm2c-prefix.c.32bit wabt-1.0.31/test/spec-wasm2c-prefix.c +--- wabt-1.0.31/test/spec-wasm2c-prefix.c.32bit 2022-11-14 05:43:40.000000000 +0100 ++++ wabt-1.0.31/test/spec-wasm2c-prefix.c 2022-12-11 22:17:36.181299604 +0100 +@@ -200,7 +200,7 @@ static bool is_equal_wasm_rt_funcref_t(w + (x.module_instance == y.module_instance); + } + +-wasm_rt_externref_t spectest_make_externref(u64 x) { ++wasm_rt_externref_t spectest_make_externref(uintptr_t x) { + return (wasm_rt_externref_t)(x + 1); // externref(0) is not null + } + diff --git a/wabt.spec b/wabt.spec index 38b5a9a..29b2622 100644 --- a/wabt.spec +++ b/wabt.spec @@ -2,14 +2,14 @@ %bcond_without check %global commit 3e8207aabe969098d2b4941142a1973008c63033 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit 4f77306bb63151631d84f58dedf67958eb9911b9 +%global ts_commit 3a04b2cf93bd8fce277458d419eea8d9c326345c %global ts_shortcommit %(c=%{ts_commit}; echo ${c:0:7}) %global wc_commit d9a80099d496b5cdba6f3fe8fc77586e0e505ddc %global wc_shortcommit %(c=%{wc_commit}; echo ${c:0:7}) Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.30 +Version: 1.0.31 Release: 1%{?dist} URL: https://github.com/WebAssembly/wabt Source0: https://github.com/WebAssembly/wabt/archive/%{version}/%{name}-%{version}.tar.gz @@ -17,6 +17,8 @@ Source1: https://github.com/WebAssembly/testsuite/archive/%{ts_commit}/%{name}-t 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 +# https://github.com/WebAssembly/wabt/issues/2099 +Patch1: wabt-32bit.patch License: ASL 2.0 BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -46,6 +48,7 @@ mv third_party/testsuite{-%{ts_commit},} tar xzf %{S:2} -C third_party mv third_party/wasm-c-api{-%{wc_commit},} %patch0 -p1 -b .orig +%patch1 -p1 -b .32bit pushd test # https://github.com/WebAssembly/wabt/issues/1365 %ifarch armv7hl @@ -60,13 +63,13 @@ rm spec/simd_f32x4_arith.txt rm spec/simd_f32x4_pmin_pmax.txt rm spec/simd_f64x2_arith.txt rm spec/simd_f64x2_pmin_pmax.txt -rm wasm2c/old-spec/select.txt rm wasm2c/spec/conversions.txt rm wasm2c/spec/float_literals.txt rm wasm2c/spec/float_memory.txt rm wasm2c/spec/float_misc.txt rm wasm2c/spec/float_exprs.txt rm wasm2c/spec/local_tee.txt +rm wasm2c/spec/select.txt %endif # https://github.com/WebAssembly/wabt/issues/1045 %ifarch ppc64le @@ -111,8 +114,8 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} %{_bindir}/wast2json %{_bindir}/wat-desugar %{_bindir}/wat2wasm +%{_datadir}/wabt %{_includedir}/wabt -%{_includedir}/wasm-rt-impl.h %{_includedir}/wasm-rt.h %{_libdir}/cmake/wabt %{_libdir}/libwabt.a @@ -131,6 +134,10 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Fri Dec 09 2022 Dominik Mierzejewski 1.0.31-1 +- update to 1.0.31 (#2143772) +- fix build on 32-bit + * Sat Oct 15 2022 Dominik Mierzejewski 1.0.30-1 - update to 1.0.30 (#2132095) - increase timeout to fix tests on ARM From 14cde6003584f851a535ed96945f0b357fadd32e Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 11 Dec 2022 22:50:40 +0100 Subject: [PATCH 18/42] fix build --without check --- wabt.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wabt.spec b/wabt.spec index 29b2622..2b1a2fa 100644 --- a/wabt.spec +++ b/wabt.spec @@ -41,12 +41,13 @@ with the spec (e.g. 1:1 round-trips with no changes to instructions). %prep %setup -q -%if %{with check} -rmdir third_party/{testsuite,wasm-c-api} -tar xzf %{S:1} -C third_party -mv third_party/testsuite{-%{ts_commit},} +rmdir third_party/wasm-c-api tar xzf %{S:2} -C third_party mv third_party/wasm-c-api{-%{wc_commit},} +%if %{with check} +rmdir third_party/testsuite +tar xzf %{S:1} -C third_party +mv third_party/testsuite{-%{ts_commit},} %patch0 -p1 -b .orig %patch1 -p1 -b .32bit pushd test @@ -137,6 +138,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} * Fri Dec 09 2022 Dominik Mierzejewski 1.0.31-1 - update to 1.0.31 (#2143772) - fix build on 32-bit +- fix build --without check * Sat Oct 15 2022 Dominik Mierzejewski 1.0.30-1 - update to 1.0.30 (#2132095) From 77e4a04f5d6bd6bb763329d4e7fd74d24a9aefa2 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 11 Dec 2022 23:15:40 +0100 Subject: [PATCH 19/42] re-enable one test on i686 This passes successfully now. --- wabt.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index 2b1a2fa..bc8f68e 100644 --- a/wabt.spec +++ b/wabt.spec @@ -65,7 +65,6 @@ rm spec/simd_f32x4_pmin_pmax.txt rm spec/simd_f64x2_arith.txt rm spec/simd_f64x2_pmin_pmax.txt rm wasm2c/spec/conversions.txt -rm wasm2c/spec/float_literals.txt rm wasm2c/spec/float_memory.txt rm wasm2c/spec/float_misc.txt rm wasm2c/spec/float_exprs.txt From 47f9c61bb48506bc58f0bc753aee745dbee69ffa Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 3 Jan 2023 18:53:29 +0100 Subject: [PATCH 20/42] update to 1.0.32 (#2156897) --- .gitignore | 1 + sources | 2 +- wabt.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 56f4104..8054c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /wabt-testsuite-4f77306.tar.gz /wabt-1.0.31.tar.gz /wabt-testsuite-3a04b2c.tar.gz +/wabt-1.0.32.tar.gz diff --git a/sources b/sources index 00d275d..55a04a6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.31.tar.gz) = 5e6e81be8d2f006b151357c6da9a201d109bea53a66468f80e77184306bbc88d40118d58d19f0582e98f5d7ad61f1dfbe2486ff9a0734454b2d459d2130d8bf3 +SHA512 (wabt-1.0.32.tar.gz) = 2d87ec27a642cf9b291accc52417e4db59a5b23ab4475b9e810ad27d5838c75527657d4b6afb87c99bf73e63e664112132896ca4506fac3acef07deffd51c457 SHA512 (wabt-testsuite-3a04b2c.tar.gz) = 4af272082c755d2cc5a5156137ac76dc2496c5eee46fe6a7b58cb795daf59a02398aed224cf9cd48de4bc74d3a7eec81ee4f94d789be6ff879d665578a369040 SHA512 (wabt-wasm-c-api-d9a8009.tar.gz) = b6ee7d2d83a3ca7b3cb3ee110282f7d32eada1d9020cadd3fdec58f40478879fd9ac9fada526021d8f6e8a26e1df7353df313d4149be2ffe4aea3a28f856fd89 diff --git a/wabt.spec b/wabt.spec index bc8f68e..482ab2a 100644 --- a/wabt.spec +++ b/wabt.spec @@ -9,7 +9,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.31 +Version: 1.0.32 Release: 1%{?dist} URL: https://github.com/WebAssembly/wabt Source0: https://github.com/WebAssembly/wabt/archive/%{version}/%{name}-%{version}.tar.gz @@ -134,6 +134,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Tue Jan 03 2023 Dominik Mierzejewski 1.0.32-1 +- update to 1.0.32 (#2156897) + * Fri Dec 09 2022 Dominik Mierzejewski 1.0.31-1 - update to 1.0.31 (#2143772) - fix build on 32-bit From c88b6479283b133cc98539711962a74e5af447d3 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 3 Jan 2023 19:28:28 +0100 Subject: [PATCH 21/42] skip one new failing test on aarch64, ppc64le and s390x for now --- wabt.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wabt.spec b/wabt.spec index 482ab2a..d32719c 100644 --- a/wabt.spec +++ b/wabt.spec @@ -51,6 +51,10 @@ mv third_party/testsuite{-%{ts_commit},} %patch0 -p1 -b .orig %patch1 -p1 -b .32bit pushd test +# https://github.com/WebAssembly/wabt/issues/2118 +%ifarch aarch64 +rm spec/relaxed-simd/relaxed_madd_nmadd.txt +%endif # https://github.com/WebAssembly/wabt/issues/1365 %ifarch armv7hl rm wasm2c/spec/skip-stack-guard-page.txt @@ -72,13 +76,17 @@ rm wasm2c/spec/local_tee.txt rm wasm2c/spec/select.txt %endif # https://github.com/WebAssembly/wabt/issues/1045 +# https://github.com/WebAssembly/wabt/issues/2118 %ifarch ppc64le rm spec/conversions.txt +rm spec/relaxed-simd/relaxed_madd_nmadd.txt rm spec/simd_conversions.txt rm wasm2c/spec/conversions.txt %endif # https://github.com/WebAssembly/wabt/issues/2070 +# https://github.com/WebAssembly/wabt/issues/2118 %ifarch s390x +rm spec/relaxed-simd/relaxed_madd_nmadd.txt rm wasm2c/spec/bulk.txt rm wasm2c/spec/memory_copy.txt rm wasm2c/spec/memory_fill.txt @@ -136,6 +144,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} %changelog * Tue Jan 03 2023 Dominik Mierzejewski 1.0.32-1 - update to 1.0.32 (#2156897) +- skip one new failing test on aarch64, ppc64le and s390x for now * Fri Dec 09 2022 Dominik Mierzejewski 1.0.31-1 - update to 1.0.31 (#2143772) From 47dbcd451e117debe3e1a96acc90682680d83560 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:33:59 +0000 Subject: [PATCH 22/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index bacb184..ffbc3c3 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.32 -Release: 1%{?dist} +Release: 2%{?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 @@ -138,6 +138,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.0.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 03 2023 Dominik Mierzejewski 1.0.32-1 - update to 1.0.32 (#2156897) - skip one new failing test on aarch64, ppc64le and s390x for now From fc83b50175396317fd9a131cc7712e78d2688587 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 16 Jun 2023 17:33:11 +0200 Subject: [PATCH 23/42] update to 1.0.33 (#2203483) drop obsolete patch disable failing tests on aarch64 and ppc64le (reported upstream) fix running tests on i686 disable failing wasm2c tests on s390x (big endian not supported upstream) --- .gitignore | 3 ++ sources | 6 ++-- wabt-32bit.patch | 12 ------- wabt-tests-i686.patch | 11 +++++++ wabt-tests.patch | 8 ++--- wabt.spec | 76 ++++++++++++++++++++++++++++++++++++++----- 6 files changed, 89 insertions(+), 27 deletions(-) delete mode 100644 wabt-32bit.patch create mode 100644 wabt-tests-i686.patch diff --git a/.gitignore b/.gitignore index 8054c6c..7344718 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,6 @@ /wabt-1.0.31.tar.gz /wabt-testsuite-3a04b2c.tar.gz /wabt-1.0.32.tar.gz +/wabt-1.0.33.tar.gz +/wabt-testsuite-7ef86dd.tar.gz +/wabt-wasm-c-api-b6dd1fb.tar.gz diff --git a/sources b/sources index 55a04a6..6ed887a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.32.tar.gz) = 2d87ec27a642cf9b291accc52417e4db59a5b23ab4475b9e810ad27d5838c75527657d4b6afb87c99bf73e63e664112132896ca4506fac3acef07deffd51c457 -SHA512 (wabt-testsuite-3a04b2c.tar.gz) = 4af272082c755d2cc5a5156137ac76dc2496c5eee46fe6a7b58cb795daf59a02398aed224cf9cd48de4bc74d3a7eec81ee4f94d789be6ff879d665578a369040 -SHA512 (wabt-wasm-c-api-d9a8009.tar.gz) = b6ee7d2d83a3ca7b3cb3ee110282f7d32eada1d9020cadd3fdec58f40478879fd9ac9fada526021d8f6e8a26e1df7353df313d4149be2ffe4aea3a28f856fd89 +SHA512 (wabt-1.0.33.tar.gz) = cf9069a09618ec81c83c3774aee4534149b6e9c53a502bab8786ff421fbe44e2774d2ff1566a62c013147ddb43286eaa70c6f62a6ca91ee0862329d2ab2730c2 +SHA512 (wabt-testsuite-7ef86dd.tar.gz) = b50b635aa6bbe66909453bd6ccb90bc8af3c7ed225500b5c189d8c77c48359708eae5fc6c0a42c7a42f7a8d697df20219f3b5e2c09473ff244373bd7a41315a8 +SHA512 (wabt-wasm-c-api-b6dd1fb.tar.gz) = 5d3eec2184f8b66e2358b85f416afaea172f24155a61c9412a9d9374aa50347cf0ebe940f35727bc8c0ffe287033b967cc97a857feab6aa9e5098458e72b4fd0 diff --git a/wabt-32bit.patch b/wabt-32bit.patch deleted file mode 100644 index fe7e5fa..0000000 --- a/wabt-32bit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wabt-1.0.31/test/spec-wasm2c-prefix.c.32bit wabt-1.0.31/test/spec-wasm2c-prefix.c ---- wabt-1.0.31/test/spec-wasm2c-prefix.c.32bit 2022-11-14 05:43:40.000000000 +0100 -+++ wabt-1.0.31/test/spec-wasm2c-prefix.c 2022-12-11 22:17:36.181299604 +0100 -@@ -200,7 +200,7 @@ static bool is_equal_wasm_rt_funcref_t(w - (x.module_instance == y.module_instance); - } - --wasm_rt_externref_t spectest_make_externref(u64 x) { -+wasm_rt_externref_t spectest_make_externref(uintptr_t x) { - return (wasm_rt_externref_t)(x + 1); // externref(0) is not null - } - diff --git a/wabt-tests-i686.patch b/wabt-tests-i686.patch new file mode 100644 index 0000000..7b6e014 --- /dev/null +++ b/wabt-tests-i686.patch @@ -0,0 +1,11 @@ +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 index c44041f..cf2a4f0 100644 --- a/wabt-tests.patch +++ b/wabt-tests.patch @@ -1,7 +1,7 @@ -diff -up wabt-1.0.30/test/run-spec-wasm2c.py.orig wabt-1.0.30/test/run-spec-wasm2c.py ---- wabt-1.0.30/test/run-spec-wasm2c.py.orig 2022-09-30 23:24:30.000000000 +0200 -+++ wabt-1.0.30/test/run-spec-wasm2c.py 2022-10-16 01:36:24.656799647 +0200 -@@ -391,6 +391,8 @@ def Compile(cc, c_filename, out_dir, *ar +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', diff --git a/wabt.spec b/wabt.spec index ffbc3c3..dc5f4a6 100644 --- a/wabt.spec +++ b/wabt.spec @@ -2,29 +2,30 @@ %bcond_without check %global commit 3e8207aabe969098d2b4941142a1973008c63033 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit 3a04b2cf93bd8fce277458d419eea8d9c326345c +%global ts_commit 7ef86ddeed81458f9031a49a40b3a3f99c1c6a8a %global ts_shortcommit %(c=%{ts_commit}; echo ${c:0:7}) -%global wc_commit d9a80099d496b5cdba6f3fe8fc77586e0e505ddc +%global wc_commit b6dd1fb658a282c64b029867845bc50ae59e1497 %global wc_shortcommit %(c=%{wc_commit}; echo ${c:0:7}) Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.32 -Release: 2%{?dist} +Version: 1.0.33 +Release: 1%{?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 -# https://github.com/WebAssembly/wabt/issues/2099 -Patch1: wabt-32bit.patch +Patch1: wabt-tests-i686.patch License: ASL 2.0 BuildRequires: cmake3 BuildRequires: gcc-c++ +BuildRequires: openssl-devel %if %{with check} BuildRequires: gtest-devel BuildRequires: python%{python3_pkgversion}-ply +BuildRequires: simde-devel >= 0.7.4~rc4 %endif # wasm.h from https://github.com/WebAssembly/wasm-c-api/ is used for build Provides: bundled(wasm-c-api) = %{wc_commit} @@ -49,11 +50,17 @@ rmdir third_party/testsuite tar xzf %{S:1} -C third_party mv third_party/testsuite{-%{ts_commit},} %patch0 -p1 -b .orig -%patch1 -p1 -b .32bit +%ifarch i686 +%patch1 -p1 -b .i686 +%endif 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 @@ -69,24 +76,69 @@ rm wasm2c/spec/float_memory.txt rm wasm2c/spec/float_misc.txt rm wasm2c/spec/float_exprs.txt 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 %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/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 @@ -100,7 +152,7 @@ popd %if %{with check} %check -test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} +test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %endif %files @@ -121,6 +173,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} %{_datadir}/wabt %{_includedir}/wabt %{_includedir}/wasm-rt.h +%{_includedir}/wasm-rt-exceptions.h %{_libdir}/cmake/wabt %{_libdir}/libwabt.a %{_libdir}/libwasm-rt-impl.a @@ -138,6 +191,13 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=240 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Thu May 25 2023 Dominik Mierzejewski 1.0.33-1 +- update to 1.0.33 (#2203483) +- drop obsolete patch +- disable failing tests on aarch64 and ppc64le (reported upstream) +- fix running tests on i686 +- disable failing wasm2c tests on s390x (big endian not supported upstream) + * Sat Jan 21 2023 Fedora Release Engineering - 1.0.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f9fd08a323bf56956a32d0945baf8cdad3a94ebe Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sat, 17 Jun 2023 09:32:27 +0200 Subject: [PATCH 24/42] fix deprecated patchN macro usage --- wabt.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wabt.spec b/wabt.spec index dc5f4a6..76cae85 100644 --- a/wabt.spec +++ b/wabt.spec @@ -49,9 +49,9 @@ 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},} -%patch0 -p1 -b .orig +%patch 0 -p1 -b .orig %ifarch i686 -%patch1 -p1 -b .i686 +%patch 1 -p1 -b .i686 %endif pushd test # https://github.com/WebAssembly/wabt/issues/2118 @@ -197,6 +197,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} - disable failing tests on aarch64 and ppc64le (reported upstream) - fix running tests on i686 - disable failing wasm2c tests on s390x (big endian not supported upstream) +- fix deprecated patchN macro usage * Sat Jan 21 2023 Fedora Release Engineering - 1.0.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 914597eda30b29e35397b16d040eff3c427aff19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:56:17 +0000 Subject: [PATCH 25/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index 76cae85..4aae235 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.33 -Release: 1%{?dist} +Release: 2%{?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 @@ -191,6 +191,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.0.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu May 25 2023 Dominik Mierzejewski 1.0.33-1 - update to 1.0.33 (#2203483) - drop obsolete patch From 110bfe3ee17a6b2de8b8b2fbdc644a277302fd19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:19:44 +0000 Subject: [PATCH 26/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index 4aae235..5e822a8 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.33 -Release: 2%{?dist} +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 @@ -191,6 +191,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 From e7ff9f14e0cc17dfa506c93b9dfaf66965361da4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:05:13 +0000 Subject: [PATCH 27/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index 5e822a8..b972346 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.33 -Release: 3%{?dist} +Release: 4%{?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 @@ -191,6 +191,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 From 5479c17e0b62e0d01fc3a4f5f2707b94d78e5de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 24 Jul 2024 18:09:15 +0200 Subject: [PATCH 28/42] convert ASL 2.0 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- wabt.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wabt.spec b/wabt.spec index b972346..ea27c54 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.33 -Release: 4%{?dist} +Release: 5%{?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 @@ -18,7 +18,8 @@ Source2: https://github.com/WebAssembly/wasm-c-api/archive/%{wc_commit}/%{name}- # https://github.com/WebAssembly/wabt/issues/1885 Patch0: wabt-tests.patch Patch1: wabt-tests-i686.patch -License: ASL 2.0 +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: openssl-devel @@ -191,6 +192,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 From 4ab4a07976f218088e320398e8c3de0d4bd0f7b0 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Mon, 9 Sep 2024 23:54:36 +0200 Subject: [PATCH 29/42] update to 1.0.36 (#2246227) - drop obsolete patches - fix some tests in i686 - simde-0.8.2 is now required --- .gitignore | 4 ++++ sources | 4 ++-- wabt-tests-i686.patch | 11 ----------- wabt-tests.patch | 12 ------------ wabt.spec | 31 ++++++++++++++++--------------- 5 files changed, 22 insertions(+), 40 deletions(-) delete mode 100644 wabt-tests-i686.patch delete mode 100644 wabt-tests.patch diff --git a/.gitignore b/.gitignore index 7344718..a16a15b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,7 @@ /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 diff --git a/sources b/sources index 6ed887a..73d6196 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.36.tar.gz) = 5b8c2b9cc7b96c0964a8c33fd13a3f0fdeb665598d6a55f47264f285f52f646865613b6745c20ebecb50f3358c454aaef6737a895bc64009c4ef06ef6ce14a7e +SHA512 (wabt-testsuite-f3f0486.tar.gz) = 7ea2b6bf91756640a204f86841aa7431f8370f995cd3effa88719df501f472de5d7cefc2621cdbbbfc156e9d1bbdedfa0fcd17b3ed02e319ad1af28d47ed393c SHA512 (wabt-wasm-c-api-b6dd1fb.tar.gz) = 5d3eec2184f8b66e2358b85f416afaea172f24155a61c9412a9d9374aa50347cf0ebe940f35727bc8c0ffe287033b967cc97a857feab6aa9e5098458e72b4fd0 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 ea27c54..5f1558a 100644 --- a/wabt.spec +++ b/wabt.spec @@ -1,24 +1,20 @@ %undefine __cmake_in_source_build %bcond_without check -%global commit 3e8207aabe969098d2b4941142a1973008c63033 +%global commit 3e826ecde1adfba5f88d10d361131405637e65a3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit 7ef86ddeed81458f9031a49a40b3a3f99c1c6a8a +%global ts_commit f3f048661dc1686d556a27d522df901cb747ab4a %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: 5%{?dist} +Version: 1.0.36 +Release: 1%{?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 -# Automatically converted from old format: ASL 2.0 - review is highly recommended. License: Apache-2.0 BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -26,7 +22,7 @@ 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} @@ -50,10 +46,6 @@ 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 pushd test # https://github.com/WebAssembly/wabt/issues/2118 # https://github.com/WebAssembly/wabt/issues/2240 @@ -153,6 +145,9 @@ popd %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} %endif @@ -163,7 +158,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 @@ -182,7 +177,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* @@ -192,6 +187,12 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 + * Wed Jul 24 2024 Miroslav Suchý - 1.0.33-5 - convert license to SPDX From 78e3e318a45d0a7ac981e163921a2e97f8141315 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 13 Sep 2024 23:12:21 +0200 Subject: [PATCH 30/42] run all tests on aarch64, all issues resolved --- wabt.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/wabt.spec b/wabt.spec index 5f1558a..f24cb9c 100644 --- a/wabt.spec +++ b/wabt.spec @@ -47,14 +47,6 @@ rmdir third_party/testsuite tar xzf %{S:1} -C third_party mv third_party/testsuite{-%{ts_commit},} 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 spec/float_exprs.txt @@ -192,6 +184,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} - drop obsolete patches - fix some tests in i686 - simde-0.8.2 is now required +- run all tests on aarch64, all issues resolved * Wed Jul 24 2024 Miroslav Suchý - 1.0.33-5 - convert license to SPDX From 531ee93cb68c4d7f5388d1473079450d7b75a9de Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 14 Sep 2024 00:30:56 +0200 Subject: [PATCH 31/42] review skipped tests on i686, ppc64le and s390x --- wabt.spec | 54 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/wabt.spec b/wabt.spec index f24cb9c..9d4bd44 100644 --- a/wabt.spec +++ b/wabt.spec @@ -49,6 +49,7 @@ mv third_party/testsuite{-%{ts_commit},} pushd test # 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 @@ -66,43 +67,62 @@ rm wasm2c/spec/multi-memory/float_memory0.txt rm wasm2c/spec/select.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/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/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_copy0.txt -rm wasm2c/spec/multi-memory/memory_fill0.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 @@ -114,7 +134,6 @@ 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 @@ -123,7 +142,7 @@ 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 +rm wasm2c/spec/threads/atomic.txt %endif popd %endif @@ -185,6 +204,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} - 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 From 9fb6f15d26dcb42284bb5778c468afbb6571b0fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:42:41 +0000 Subject: [PATCH 32/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index 9d4bd44..e498dff 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.36 -Release: 1%{?dist} +Release: 2%{?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 @@ -198,6 +198,9 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 From c35b4e5e61d3857fdbeaa052bbde2a9e5bdb820a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 18 Feb 2025 10:08:15 +0100 Subject: [PATCH 33/42] skip failing test on ppc64le with GCC 15 --- wabt.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wabt.spec b/wabt.spec index e498dff..c1f81db 100644 --- a/wabt.spec +++ b/wabt.spec @@ -71,6 +71,10 @@ rm wasm2c/spec/select.txt %ifarch ppc64le rm spec/conversions.txt rm spec/simd_conversions.txt +# https://github.com/WebAssembly/wabt/issues/2542 +%if 0%{?fedora} > 41 +rm wasm2c/spec/float_exprs.txt +%endif rm wasm2c/spec/simd_address.txt rm wasm2c/spec/simd_f32x4_arith.txt rm wasm2c/spec/simd_f32x4_pmin_pmax.txt @@ -200,6 +204,7 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %changelog * Sun Jan 19 2025 Fedora Release Engineering - 1.0.36-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild +- skip failing test on ppc64le with GCC 15 (Dominik Mierzejewski) * Mon Sep 09 2024 Dominik Mierzejewski 1.0.36-1 - update to 1.0.36 (#2246227) From 55833e1d9444a60a01deb390e121612d49461666 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 21 Feb 2025 10:04:56 +0100 Subject: [PATCH 34/42] 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 --- wabt-test-timeout.patch | 12 +++++ wabt.spec | 98 +++++++++-------------------------------- 2 files changed, 33 insertions(+), 77 deletions(-) create mode 100644 wabt-test-timeout.patch 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 c1f81db..b27df34 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,11 +10,13 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.36 -Release: 2%{?dist} +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: gcc-c++ @@ -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 @@ -71,88 +74,25 @@ rm wasm2c/spec/select.txt %ifarch ppc64le rm spec/conversions.txt rm spec/simd_conversions.txt -# https://github.com/WebAssembly/wabt/issues/2542 -%if 0%{?fedora} > 41 -rm wasm2c/spec/float_exprs.txt -%endif 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 +%if 0%{?fedora} > 41 +%ifarch ppc64le s390x +# https://github.com/WebAssembly/wabt/issues/2542 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 %endif popd %endif %build -%cmake3 -DUSE_SYSTEM_GTEST=ON +%cmake3 -DUSE_SYSTEM_GTEST=ON \ +%ifarch i686 + -DWASM2C_CFLAGS="-msse2 -mfpmath=sse" +%endif %cmake3_build %install @@ -160,10 +100,9 @@ popd %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 @@ -202,9 +141,14 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=1200 %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 -- skip failing test on ppc64le with GCC 15 (Dominik Mierzejewski) * Mon Sep 09 2024 Dominik Mierzejewski 1.0.36-1 - update to 1.0.36 (#2246227) From b0be39b23fd12b141ce948a221919ed89b544f28 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 4 Mar 2025 22:24:03 +0100 Subject: [PATCH 35/42] 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 --- .gitignore | 2 ++ sources | 4 ++-- wabt.spec | 19 ++++++++++--------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index a16a15b..fd27f29 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ /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 diff --git a/sources b/sources index 73d6196..5e5c675 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.37.tar.gz) = 446622858458553f56187cf17e9435168837ac093f81f81852f12b0aeb7e6e542c5ac1fbce1dde1265107add52cc3f2cacf0c2cf25154d168080b8bece15e21b +SHA512 (wabt-testsuite-cbc54d7.tar.gz) = ed1761f69c03d9b69fc1e4e6bc25a5b69e4f15a19ba26bc110851e9a68e71cd718e7cf2c76cd8dcf82f0f5321102654b450aadb39cd3cb37a3cdc2669d6f6e75 SHA512 (wabt-wasm-c-api-b6dd1fb.tar.gz) = 5d3eec2184f8b66e2358b85f416afaea172f24155a61c9412a9d9374aa50347cf0ebe940f35727bc8c0ffe287033b967cc97a857feab6aa9e5098458e72b4fd0 diff --git a/wabt.spec b/wabt.spec index b27df34..3b1cc83 100644 --- a/wabt.spec +++ b/wabt.spec @@ -2,15 +2,15 @@ %bcond_without check %global commit 3e826ecde1adfba5f88d10d361131405637e65a3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ts_commit f3f048661dc1686d556a27d522df901cb747ab4a +%global ts_commit cbc54d77065e5202bcb69e0d1c53ceccc29a7984 %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: 3%{?dist} +Version: 1.0.37 +Release: 1%{?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 @@ -68,23 +68,19 @@ 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 -%if 0%{?fedora} > 41 -%ifarch ppc64le s390x -# https://github.com/WebAssembly/wabt/issues/2542 -rm wasm2c/spec/float_exprs.txt -%endif -%endif popd %endif @@ -141,6 +137,11 @@ cmake --build redhat-linux-build --verbose --target run-tests %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 From 5dcbcb4364916ee678daa0b8e9c3424de68a70ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:16:11 +0000 Subject: [PATCH 36/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index 3b1cc83..bc6b27e 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.37 -Release: 1%{?dist} +Release: 2%{?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 @@ -137,6 +137,9 @@ cmake --build redhat-linux-build --verbose --target run-tests %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 From 96471733b708aafc8c194175a5e18081a32fa898 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 17 Nov 2025 12:52:27 +0100 Subject: [PATCH 37/42] update to 1.0.39 (resolves rhbz#2401391) --- .gitignore | 2 ++ sources | 4 ++-- wabt.spec | 11 +++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index fd27f29..d499f29 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ /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 diff --git a/sources b/sources index 5e5c675..ca77cac 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.37.tar.gz) = 446622858458553f56187cf17e9435168837ac093f81f81852f12b0aeb7e6e542c5ac1fbce1dde1265107add52cc3f2cacf0c2cf25154d168080b8bece15e21b -SHA512 (wabt-testsuite-cbc54d7.tar.gz) = ed1761f69c03d9b69fc1e4e6bc25a5b69e4f15a19ba26bc110851e9a68e71cd718e7cf2c76cd8dcf82f0f5321102654b450aadb39cd3cb37a3cdc2669d6f6e75 +SHA512 (wabt-1.0.39.tar.gz) = be6424783fd9cb87d8b1b69babcd8ce257b71146b6c9df63989c2c2a3a83f321f94dd9441115eec8ad62b7c7b57aeade5b3803f23181c89265d027525fbabc6a +SHA512 (wabt-testsuite-d76759e.tar.gz) = fa5a6315098d2764e7170feeefaa8161ea5577769b98f4a4301e594e555dccb59395212a33585970509912ae08bb40478119e989894e60e0103acd52378837ea SHA512 (wabt-wasm-c-api-b6dd1fb.tar.gz) = 5d3eec2184f8b66e2358b85f416afaea172f24155a61c9412a9d9374aa50347cf0ebe940f35727bc8c0ffe287033b967cc97a857feab6aa9e5098458e72b4fd0 diff --git a/wabt.spec b/wabt.spec index bc6b27e..bfeea9c 100644 --- a/wabt.spec +++ b/wabt.spec @@ -1,16 +1,16 @@ %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 cbc54d77065e5202bcb69e0d1c53ceccc29a7984 +%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.37 -Release: 2%{?dist} +Version: 1.0.39 +Release: 1%{?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 @@ -137,6 +137,9 @@ cmake --build redhat-linux-build --verbose --target run-tests %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 From 22610acf6eb0c49fe9132f82b5613650bbb2d51d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:06:01 +0000 Subject: [PATCH 38/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index bfeea9c..17e2705 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.39 -Release: 1%{?dist} +Release: 2%{?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 @@ -137,6 +137,9 @@ cmake --build redhat-linux-build --verbose --target run-tests %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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) From bd51f1b693ecc951c56c413fcd9d1bcc81f83791 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 16 Apr 2026 13:16:38 +0200 Subject: [PATCH 39/42] update to 1.0.40 (resolves rhbz#2446432) - stop using obsolete cmake3 macros --- .gitignore | 1 + sources | 2 +- wabt.spec | 16 ++++++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d499f29..73e79e0 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /wabt-testsuite-cbc54d7.tar.gz /wabt-1.0.39.tar.gz /wabt-testsuite-d76759e.tar.gz +/wabt-1.0.40.tar.gz diff --git a/sources b/sources index ca77cac..5692292 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.39.tar.gz) = be6424783fd9cb87d8b1b69babcd8ce257b71146b6c9df63989c2c2a3a83f321f94dd9441115eec8ad62b7c7b57aeade5b3803f23181c89265d027525fbabc6a +SHA512 (wabt-1.0.40.tar.gz) = 48e6419067c8323a56887b4fb37c4ef694296395328dd03ca414c83e62a2163face4da9c01d595eb6d1a73bded0a8b56fa0f4ae917f8062814b1166bcd027b47 SHA512 (wabt-testsuite-d76759e.tar.gz) = fa5a6315098d2764e7170feeefaa8161ea5577769b98f4a4301e594e555dccb59395212a33585970509912ae08bb40478119e989894e60e0103acd52378837ea SHA512 (wabt-wasm-c-api-b6dd1fb.tar.gz) = 5d3eec2184f8b66e2358b85f416afaea172f24155a61c9412a9d9374aa50347cf0ebe940f35727bc8c0ffe287033b967cc97a857feab6aa9e5098458e72b4fd0 diff --git a/wabt.spec b/wabt.spec index 17e2705..fca5f43 100644 --- a/wabt.spec +++ b/wabt.spec @@ -9,8 +9,8 @@ Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.39 -Release: 2%{?dist} +Version: 1.0.40 +Release: 1%{?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 @@ -18,7 +18,7 @@ Source2: https://github.com/WebAssembly/wasm-c-api/archive/%{wc_commit}/%{name}- # 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} @@ -85,14 +85,14 @@ popd %endif %build -%cmake3 -DUSE_SYSTEM_GTEST=ON \ +%cmake -DUSE_SYSTEM_GTEST=ON \ %ifarch i686 -DWASM2C_CFLAGS="-msse2 -mfpmath=sse" %endif -%cmake3_build +%cmake_build %install -%cmake3_install +%cmake_install %if %{with check} %check @@ -137,6 +137,10 @@ cmake --build redhat-linux-build --verbose --target run-tests %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 From af59173ac7f3abc94aa6077cd1b567cc7d7e93c3 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 21 May 2026 18:01:11 +0200 Subject: [PATCH 40/42] update to 1.0.41 (resolves rhbz#2467788) --- .gitignore | 1 + sources | 2 +- wabt.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 73e79e0..583cdcc 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /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 5692292..dab7fb8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wabt-1.0.40.tar.gz) = 48e6419067c8323a56887b4fb37c4ef694296395328dd03ca414c83e62a2163face4da9c01d595eb6d1a73bded0a8b56fa0f4ae917f8062814b1166bcd027b47 +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.spec b/wabt.spec index fca5f43..6607d1f 100644 --- a/wabt.spec +++ b/wabt.spec @@ -9,7 +9,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt -Version: 1.0.40 +Version: 1.0.41 Release: 1%{?dist} URL: https://github.com/WebAssembly/wabt Source0: https://github.com/WebAssembly/wabt/archive/%{version}/%{name}-%{version}.tar.gz @@ -137,6 +137,9 @@ cmake --build redhat-linux-build --verbose --target run-tests %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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 From 3ca84fcaf78753806ca4f0b41549174a0f977a7f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:04:12 -0400 Subject: [PATCH 41/42] Rebuilt for openssl 4.0 --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index 6607d1f..a1ed23d 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.41 -Release: 1%{?dist} +Release: 2%{?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 @@ -137,6 +137,9 @@ cmake --build redhat-linux-build --verbose --target run-tests %{?_smp_mflags} %{_mandir}/man1/wat2wasm.1* %changelog +* 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) From a84dfd7eb10b528f309d68cd742d9f5ed9d08b9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:40:18 +0000 Subject: [PATCH 42/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- wabt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wabt.spec b/wabt.spec index a1ed23d..5c0d5e9 100644 --- a/wabt.spec +++ b/wabt.spec @@ -10,7 +10,7 @@ Summary: The WebAssembly Binary Toolkit Name: wabt Version: 1.0.41 -Release: 2%{?dist} +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 @@ -137,6 +137,9 @@ cmake --build redhat-linux-build --verbose --target run-tests %{?_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