community/binaryen: upgrade to 1.37.14

3 files changed, 40 insertions, 35 deletions

diff --git a/community/binaryen/APKBUILD b/community/binaryen/APKBUILD
index ffc6180af2..9f0dfdff05 100644
--- a/community/binaryen/APKBUILD
+++ b/community/binaryen/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=binaryen
-pkgver=1.37.12
+pkgver=1.37.14
 pkgrel=0
 pkgdesc="Compiler infrastructure and toolchain library for WebAssembly, in C++"
 url="https://github.com/WebAssembly/binaryen"
@@ -11,8 +11,7 @@ makedepends="cmake"
 checkdepends="nodejs python2"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/WebAssembly/$pkgname/archive/$pkgver.tar.gz
-	link-dynamically.patch
-	dont-enforce-sse.patch"
+	link-dynamically.patch"
 builddir="$srcdir/$pkgname-$pkgver"
 
 case "$CARCH" in
@@ -48,6 +47,5 @@ package() {
 	rm "$pkgdir"/usr/share/binaryen/binaryen.js
 }
 
-sha512sums="4a54d33e04e31b0ab696dbc0a617662ce059da3a98eaf2143869a76b7da35cb1951c7c024e47f986528bcca8c0b3a3f4b04011160b23915e91b3602d00427d69  binaryen-1.37.12.tar.gz
-4c69c4fe55690694143163576036b935072b7b0eac30e17921115b3ddeb58266a91cf7b6ff39396cede9059dac4fa2f9de691f6fd83cddca88abbbcc93d3c4fd  link-dynamically.patch
-747dcebb46db3480f877f004c8a5efee297cedda7f826b1a85ba4a0cddc357c480a668efd5bfdf58f716d15756c7634fa73cc1a84c7a66edb43178f0e746537e  dont-enforce-sse.patch"
+sha512sums="420a79020fdbf9e79ac55441c27839db5a55c5ce4ace21f289bb2e6a96bde79f47b93097a570f5ace8b80837c51b91c115727283b9d11731120749f6e107dd5b  binaryen-1.37.14.tar.gz
+4a6f6708b8d72ba0be901eb0a6cba4e07e40270fc1d5abf5bea5f82ef34100ecb2017a1c8ae1c4b10446ef87d0328f4b4f9a7776ec8c2f850170fe241cfda1c6  link-dynamically.patch"
diff --git a/community/binaryen/dont-enforce-sse.patch b/community/binaryen/dont-enforce-sse.patch
deleted file mode 100644
index 970477cbd0..0000000000
--- a/community/binaryen/dont-enforce-sse.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Not all CPU architectures support these instructions.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,8 +92,6 @@
-   SET(CMAKE_THREAD_PREFER_PTHREAD ON)
-   FIND_PACKAGE(Threads REQUIRED)
-   ADD_COMPILE_FLAG("-std=c++11")
--  ADD_COMPILE_FLAG("-msse2")
--  ADD_COMPILE_FLAG("-mfpmath=sse")
-   ADD_COMPILE_FLAG("-Wall")
-   ADD_COMPILE_FLAG("-Werror")
-   ADD_COMPILE_FLAG("-Wextra")
diff --git a/community/binaryen/link-dynamically.patch b/community/binaryen/link-dynamically.patch
index f5945dba3e..0fcdca4743 100644
--- a/community/binaryen/link-dynamically.patch
+++ b/community/binaryen/link-dynamically.patch
@@ -1,70 +1,89 @@
 From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sat, 3 Apr 2017 00:01:00 +0200
+Date: Wed, 21 Jun 2017 12:17:00 +0200
 Subject: [PATCH] Link binaries with libbinaryen dynamically
 
 Link binaries with libbinaryen.so to significantly reduce their size.
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -137,7 +137,7 @@
+@@ -191,7 +191,7 @@
  ELSE()
    ADD_LIBRARY(binaryen SHARED ${binaryen_SOURCES})
  ENDIF()
--TARGET_LINK_LIBRARIES(binaryen ${all_passes} wasm asmjs ast support)
-+TARGET_LINK_LIBRARIES(binaryen ${all_passes} wasm asmjs ast support emscripten-optimizer)
+-TARGET_LINK_LIBRARIES(binaryen ${all_passes} wasm asmjs ast cfg support)
++TARGET_LINK_LIBRARIES(binaryen ${all_passes} wasm asmjs ast cfg support emscripten-optimizer)
  INSTALL(TARGETS binaryen DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
- INSTALL(FILES src/binaryen-c.h DESTINATION include)
-@@ -151,7 +151,7 @@
+ INSTALL(FILES src/binaryen-c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+@@ -204,7 +204,7 @@
  )
  ADD_EXECUTABLE(wasm-shell
                 ${wasm-shell_SOURCES})
--TARGET_LINK_LIBRARIES(wasm-shell wasm asmjs emscripten-optimizer ${all_passes} ast support)
+-TARGET_LINK_LIBRARIES(wasm-shell wasm asmjs emscripten-optimizer ${all_passes} ast cfg support)
 +TARGET_LINK_LIBRARIES(wasm-shell binaryen)
  SET_PROPERTY(TARGET wasm-shell PROPERTY CXX_STANDARD 11)
  SET_PROPERTY(TARGET wasm-shell PROPERTY CXX_STANDARD_REQUIRED ON)
  INSTALL(TARGETS wasm-shell DESTINATION ${CMAKE_INSTALL_BINDIR})
-@@ -161,7 +161,7 @@
+@@ -215,7 +215,7 @@
  )
  ADD_EXECUTABLE(wasm-opt
                 ${wasm-opt_SOURCES})
--TARGET_LINK_LIBRARIES(wasm-opt wasm asmjs emscripten-optimizer ${all_passes} ast support)
+-TARGET_LINK_LIBRARIES(wasm-opt wasm asmjs emscripten-optimizer ${all_passes} ast cfg support)
 +TARGET_LINK_LIBRARIES(wasm-opt binaryen)
  SET_PROPERTY(TARGET wasm-opt PROPERTY CXX_STANDARD 11)
  SET_PROPERTY(TARGET wasm-opt PROPERTY CXX_STANDARD_REQUIRED ON)
  INSTALL(TARGETS wasm-opt DESTINATION ${CMAKE_INSTALL_BINDIR})
-@@ -172,7 +172,7 @@
+@@ -225,7 +225,7 @@
+ )
+ ADD_EXECUTABLE(wasm-merge
+                ${wasm-merge_SOURCES})
+-TARGET_LINK_LIBRARIES(wasm-merge wasm asmjs emscripten-optimizer ${all_passes} ast cfg support)
++TARGET_LINK_LIBRARIES(wasm-merge binaryen)
+ SET_PROPERTY(TARGET wasm-merge PROPERTY CXX_STANDARD 11)
+ SET_PROPERTY(TARGET wasm-merge PROPERTY CXX_STANDARD_REQUIRED ON)
+ INSTALL(TARGETS wasm-merge DESTINATION bin)
+@@ -236,7 +236,7 @@
  )
  ADD_EXECUTABLE(asm2wasm
                 ${asm2wasm_SOURCES})
--TARGET_LINK_LIBRARIES(asm2wasm emscripten-optimizer ${all_passes} wasm asmjs ast support)
+-TARGET_LINK_LIBRARIES(asm2wasm emscripten-optimizer ${all_passes} wasm asmjs ast cfg support)
 +TARGET_LINK_LIBRARIES(asm2wasm binaryen)
  SET_PROPERTY(TARGET asm2wasm PROPERTY CXX_STANDARD 11)
  SET_PROPERTY(TARGET asm2wasm PROPERTY CXX_STANDARD_REQUIRED ON)
  INSTALL(TARGETS asm2wasm DESTINATION ${CMAKE_INSTALL_BINDIR})
-@@ -184,7 +184,7 @@
+@@ -248,7 +248,7 @@
  )
  ADD_EXECUTABLE(s2wasm
                 ${s2wasm_SOURCES})
--TARGET_LINK_LIBRARIES(s2wasm passes wasm asmjs ast support)
+-TARGET_LINK_LIBRARIES(s2wasm passes wasm asmjs ast cfg support)
 +TARGET_LINK_LIBRARIES(s2wasm binaryen)
  SET_PROPERTY(TARGET s2wasm PROPERTY CXX_STANDARD 11)
  SET_PROPERTY(TARGET s2wasm PROPERTY CXX_STANDARD_REQUIRED ON)
  INSTALL(TARGETS s2wasm DESTINATION ${CMAKE_INSTALL_BINDIR})
-@@ -194,7 +194,7 @@
+@@ -258,7 +258,7 @@
  )
  ADD_EXECUTABLE(wasm-as
                 ${wasm_as_SOURCES})
--TARGET_LINK_LIBRARIES(wasm-as wasm asmjs passes ast support)
+-TARGET_LINK_LIBRARIES(wasm-as wasm asmjs passes ast cfg support)
 +TARGET_LINK_LIBRARIES(wasm-as binaryen)
  SET_PROPERTY(TARGET wasm-as PROPERTY CXX_STANDARD 11)
  SET_PROPERTY(TARGET wasm-as PROPERTY CXX_STANDARD_REQUIRED ON)
  INSTALL(TARGETS wasm-as DESTINATION ${CMAKE_INSTALL_BINDIR})
-@@ -204,7 +204,7 @@
+@@ -268,7 +268,7 @@
  )
  ADD_EXECUTABLE(wasm-dis
                 ${wasm_dis_SOURCES})
--TARGET_LINK_LIBRARIES(wasm-dis passes wasm asmjs ast support)
+-TARGET_LINK_LIBRARIES(wasm-dis passes wasm asmjs ast cfg support)
 +TARGET_LINK_LIBRARIES(wasm-dis binaryen)
  SET_PROPERTY(TARGET wasm-dis PROPERTY CXX_STANDARD 11)
  SET_PROPERTY(TARGET wasm-dis PROPERTY CXX_STANDARD_REQUIRED ON)
  INSTALL(TARGETS wasm-dis DESTINATION ${CMAKE_INSTALL_BINDIR})
+@@ -278,7 +278,7 @@
+ )
+ ADD_EXECUTABLE(wasm-ctor-eval
+                ${wasm-ctor-eval_SOURCES})
+-TARGET_LINK_LIBRARIES(wasm-ctor-eval wasm asmjs emscripten-optimizer ${all_passes} ast cfg support)
++TARGET_LINK_LIBRARIES(wasm-ctor-eval binaryen)
+ SET_PROPERTY(TARGET wasm-ctor-eval PROPERTY CXX_STANDARD 11)
+ SET_PROPERTY(TARGET wasm-ctor-eval PROPERTY CXX_STANDARD_REQUIRED ON)
+ INSTALL(TARGETS wasm-ctor-eval DESTINATION bin)