community/binaryen: upgrade to 38

Moving to correct version number. Version 1.37.x is actually version of
emscripten, not binaryen...

https://github.com/WebAssembly/binaryen/issues/1156
https://github.com/WebAssembly/binaryen/pull/1173#discussion_r137853641

2 files changed, 38 insertions, 20 deletions

diff --git a/community/binaryen/APKBUILD b/community/binaryen/APKBUILD
index 01d17327dc..5cf4c22ae4 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.18
+pkgver=38
 pkgrel=0
 pkgdesc="Compiler infrastructure and toolchain library for WebAssembly, in C++"
 url="https://github.com/WebAssembly/binaryen"
@@ -10,10 +10,10 @@ license="ASL-2.0"
 makedepends="cmake"
 checkdepends="nodejs python2"
 subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/WebAssembly/$pkgname/archive/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/WebAssembly/$pkgname/archive/version_$pkgver.tar.gz
 	link-dynamically.patch
 	ignore-type-limits-error.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$pkgname-version_$pkgver"
 
 case "$CARCH" in
 	x86) options="!check";;  # XXX: two tests fail
@@ -48,6 +48,6 @@ package() {
 	rm "$pkgdir"/usr/share/binaryen/binaryen.js
 }
 
-sha512sums="684db138400764d90b38a7394a35e4b9ec47892c73de568b50daa1f3ad4ea98a4c4bf0e7fdd90aaf4a49ed29fccb309078cb2c6053f1b15143df7c68943677d6  binaryen-1.37.18.tar.gz
-4a6f6708b8d72ba0be901eb0a6cba4e07e40270fc1d5abf5bea5f82ef34100ecb2017a1c8ae1c4b10446ef87d0328f4b4f9a7776ec8c2f850170fe241cfda1c6  link-dynamically.patch
+sha512sums="be878f6b95e8961822f7a65cb08150eb93aed763bae13de14f481ba02dc0736f0d78dceb6556f287b1c08ec26bcd6a1e2f130ccb4628e8d048bbcc426e89c6c0  binaryen-38.tar.gz
+81e27282425c1ce878548a42f18aa9d35c02c4d26353f0a3e8d2c1e4d47435c3c4a3503ad384a5f3facb61c43b51ad43d64d5af233c3369e65d00484418b52fe  link-dynamically.patch
 3b95a197cd8805dfa714cf9f31adc1437b6d29bd4082f752c16d98c40cd024b110c02a412285c78251cb5d0b3080c0f9e4d45d8dd0166c71b9462b1610191ab8  ignore-type-limits-error.patch"
diff --git a/community/binaryen/link-dynamically.patch b/community/binaryen/link-dynamically.patch
index 0fcdca4743..8a55a2dfc7 100644
--- a/community/binaryen/link-dynamically.patch
+++ b/community/binaryen/link-dynamically.patch
@@ -6,53 +6,62 @@ Link binaries with libbinaryen.so to significantly reduce their size.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -191,7 +191,7 @@
+@@ -193,7 +193,7 @@
  ELSE()
    ADD_LIBRARY(binaryen SHARED ${binaryen_SOURCES})
  ENDIF()
--TARGET_LINK_LIBRARIES(binaryen ${all_passes} wasm asmjs ast cfg support)
-+TARGET_LINK_LIBRARIES(binaryen ${all_passes} wasm asmjs ast cfg support emscripten-optimizer)
+-TARGET_LINK_LIBRARIES(binaryen passes wasm asmjs emscripten-optimizer ast cfg support)
++TARGET_LINK_LIBRARIES(binaryen passes wasm asmjs emscripten-optimizer ast cfg support emscripten-optimizer)
  INSTALL(TARGETS binaryen DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
  INSTALL(FILES src/binaryen-c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-@@ -204,7 +204,7 @@
+@@ -206,7 +206,7 @@
  )
  ADD_EXECUTABLE(wasm-shell
                 ${wasm-shell_SOURCES})
--TARGET_LINK_LIBRARIES(wasm-shell wasm asmjs emscripten-optimizer ${all_passes} ast cfg support)
+-TARGET_LINK_LIBRARIES(wasm-shell wasm asmjs emscripten-optimizer 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})
-@@ -215,7 +215,7 @@
+@@ -217,7 +217,7 @@
  )
  ADD_EXECUTABLE(wasm-opt
                 ${wasm-opt_SOURCES})
--TARGET_LINK_LIBRARIES(wasm-opt wasm asmjs emscripten-optimizer ${all_passes} ast cfg support)
+-TARGET_LINK_LIBRARIES(wasm-opt wasm asmjs emscripten-optimizer 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})
-@@ -225,7 +225,7 @@
+@@ -227,7 +227,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 wasm asmjs emscripten-optimizer 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 @@
+@@ -238,7 +238,7 @@
  )
  ADD_EXECUTABLE(asm2wasm
                 ${asm2wasm_SOURCES})
--TARGET_LINK_LIBRARIES(asm2wasm emscripten-optimizer ${all_passes} wasm asmjs ast cfg support)
+-TARGET_LINK_LIBRARIES(asm2wasm emscripten-optimizer 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})
 @@ -248,7 +248,7 @@
  )
+ ADD_EXECUTABLE(wasm2asm
+                ${wasm2asm_SOURCES})
+-TARGET_LINK_LIBRARIES(wasm2asm passes wasm asmjs emscripten-optimizer ast cfg support)
++TARGET_LINK_LIBRARIES(wasm2asm binaryen)
+ SET_PROPERTY(TARGET wasm2asm PROPERTY CXX_STANDARD 11)
+ SET_PROPERTY(TARGET wasm2asm PROPERTY CXX_STANDARD_REQUIRED ON)
+ INSTALL(TARGETS wasm2asm DESTINATION ${CMAKE_INSTALL_BINDIR})
+@@ -260,7 +260,7 @@
+ )
  ADD_EXECUTABLE(s2wasm
                 ${s2wasm_SOURCES})
 -TARGET_LINK_LIBRARIES(s2wasm passes wasm asmjs ast cfg support)
@@ -60,7 +69,7 @@ Link binaries with libbinaryen.so to significantly reduce their size.
  SET_PROPERTY(TARGET s2wasm PROPERTY CXX_STANDARD 11)
  SET_PROPERTY(TARGET s2wasm PROPERTY CXX_STANDARD_REQUIRED ON)
  INSTALL(TARGETS s2wasm DESTINATION ${CMAKE_INSTALL_BINDIR})
-@@ -258,7 +258,7 @@
+@@ -270,7 +270,7 @@
  )
  ADD_EXECUTABLE(wasm-as
                 ${wasm_as_SOURCES})
@@ -69,7 +78,7 @@ Link binaries with libbinaryen.so to significantly reduce their size.
  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})
-@@ -268,7 +268,7 @@
+@@ -280,7 +280,7 @@
  )
  ADD_EXECUTABLE(wasm-dis
                 ${wasm_dis_SOURCES})
@@ -78,12 +87,21 @@ Link binaries with libbinaryen.so to significantly reduce their size.
  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 @@
+@@ -290,7 +290,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 emscripten-optimizer passes wasm asmjs 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)
+@@ -303,7 +303,7 @@
+   )
+   ADD_EXECUTABLE(wasm-reduce
+                  ${wasm-reduce_SOURCES})
+-  TARGET_LINK_LIBRARIES(wasm-reduce wasm asmjs passes wasm ast cfg support)
++  TARGET_LINK_LIBRARIES(wasm-reduce binaryen)
+   SET_PROPERTY(TARGET wasm-reduce PROPERTY CXX_STANDARD 11)
+   SET_PROPERTY(TARGET wasm-reduce PROPERTY CXX_STANDARD_REQUIRED ON)
+   INSTALL(TARGETS wasm-reduce DESTINATION ${CMAKE_INSTALL_BINDIR})