update to 110 (#2081423)

fix building with external gtest

.gitignore

@@ -9,3 +9,5 @@
 /binaryen-version_103.tar.gz
 /binaryen-version_104.tar.gz
 /binaryen-version_105.tar.gz
+/binaryen-version_109.tar.gz
+/binaryen-version_110.tar.gz

binaryen-use-system-gtest.patch

@@ -0,0 +1,25 @@
+diff -up binaryen-version_109/test/gtest/CMakeLists.txt.gtest binaryen-version_109/test/gtest/CMakeLists.txt
+--- binaryen-version_109/test/gtest/CMakeLists.txt.gtest	2022-06-15 00:57:59.352826008 +0200
++++ binaryen-version_109/test/gtest/CMakeLists.txt	2022-06-15 00:58:38.886646467 +0200
+@@ -1,4 +1,3 @@
+-include_directories(../../third_party/googletest/googletest/include)
+ include_directories(../../src/wasm)
+ 
+ set(unittest_SOURCES
+diff -up binaryen-version_109/third_party/CMakeLists.txt.gtest binaryen-version_109/third_party/CMakeLists.txt
+--- binaryen-version_109/third_party/CMakeLists.txt.gtest	2022-06-14 19:59:23.000000000 +0200
++++ binaryen-version_109/third_party/CMakeLists.txt	2022-06-15 00:57:59.352826008 +0200
+@@ -2,12 +2,6 @@ if(BUILD_LLVM_DWARF)
+   add_subdirectory(llvm-project)
+ endif()
+ 
+-include_directories(
+-  googletest/googletest
+-  googletest/googletest/include
+-)
+-
+ if(BUILD_TESTS)
+-  add_library(gtest STATIC googletest/googletest/src/gtest-all.cc)
+-  add_library(gtest_main STATIC googletest/googletest/src/gtest_main.cc)
++  find_package(GTest)
+ endif()

binaryen.spec

@@ -2,11 +2,12 @@
 
 Summary:       Compiler and toolchain infrastructure library for WebAssembly
 Name:          binaryen
-Version:       105
-Release:       3%{?dist}
+Version:       110
+Release:       1%{?dist}
 
 URL:           https://github.com/WebAssembly/binaryen
 Source0:       %{url}/archive/version_%{version}/%{name}-version_%{version}.tar.gz
+Patch0:        %{name}-use-system-gtest.patch
 License:       ASL 2.0
 
 # tests fail on big-endian
@@ -15,6 +16,7 @@ ExcludeArch:   ppc64 s390x
 BuildRequires: cmake3
 BuildRequires: gcc-c++
 %if %{with check}
+BuildRequires: gtest-devel
 BuildRequires: nodejs
 BuildRequires: python3dist(filecheck)
 BuildRequires: python3dist(lit)
@@ -50,6 +52,7 @@ effective:
 
 %prep
 %setup -q -n %{name}-version_%{version}
+%patch0 -p1 -b .gtest
 
 %build
 %cmake3 \
@@ -62,15 +65,16 @@ effective:
 
 %install
 %cmake3_install
+rm -v %{buildroot}%{_bindir}/binaryen-unittests
 
 %if %{with check}
 %check
-install -pm755 %{__cmake_builddir}/bin/binaryen-lit %{buildroot}%{_bindir}
+install -pm755 %{__cmake_builddir}/bin/binaryen-{lit,unittests} %{buildroot}%{_bindir}
 ./check.py \
     --binaryen-bin %{buildroot}%{_bindir} \
     --binaryen-lib %{buildroot}%{_libdir}/%{name} \
 
-rm -v %{buildroot}%{_bindir}/binaryen-lit
+rm -v %{buildroot}%{_bindir}/binaryen-{lit,unittests}
 %endif
 
 %files
@@ -92,6 +96,10 @@ rm -v %{buildroot}%{_bindir}/binaryen-lit
 %{_libdir}/%{name}/libbinaryen.so
 
 %changelog
+* Wed Sep 21 2022 Dominik Mierzejewski <rpm@greysector.net> 110-1
+- update to 110 (#2081423)
+- fix building with external gtest
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 105-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (binaryen-version_105.tar.gz) = 5b16551fab37c660900abeae49fb4e23abc0b61165d326ce4db23959a0eab640df0df03c5649c0bcd35a8515b959a7a9d78d1014c4ea6cb08da4ef48f715f702
+SHA512 (binaryen-version_110.tar.gz) = bfe5e8c98409a422145aa64c71d3d5b89bba3d965a3981b9db72a3034daee464606dee117eba3fdcb3e9e34d2fdee8f0a30fa48aaff4d5e34723f20cc01f0197