diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-03 19:51:18 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-03 19:52:59 +0200 |
| commit | c80e424f4e7cdf60cc2b949d4139422ebed6783c (patch) | |
| tree | 4da5a8eb4c8bbee0b2753c6364ecd5fa580ea7f3 /testing/emscripten | |
| parent | 911d1a0406cf86f7d992807a16a4540b524bed25 (diff) | |
| download | aports-c80e424f4e7cdf60cc2b949d4139422ebed6783c.tar.bz2 aports-c80e424f4e7cdf60cc2b949d4139422ebed6783c.tar.xz | |
testing/emscripten: fix issues with Closure Compiler
And relax version bound for emscripten-optimizer.
Diffstat (limited to 'testing/emscripten')
| -rw-r--r-- | testing/emscripten/APKBUILD | 10 | ||||
| -rw-r--r-- | testing/emscripten/closurecompiler-externs-path.patch | 17 | ||||
| -rw-r--r-- | testing/emscripten/closurecompiler-language_in-es6.patch | 21 |
3 files changed, 45 insertions, 3 deletions
diff --git a/testing/emscripten/APKBUILD b/testing/emscripten/APKBUILD index fa3d8cff34..eec4c2ef29 100644 --- a/testing/emscripten/APKBUILD +++ b/testing/emscripten/APKBUILD @@ -6,13 +6,13 @@ pkgname=emscripten # Keep with sync with pkg emscrypten-fastcomp! pkgver=1.37.9 -pkgrel=0 +pkgrel=2 pkgdesc="An LLVM-to-JavaScript Compiler" url="https://kripken.github.io/emscripten-site/" arch="all" license="MIT UOI-NCSA" -depends="$pkgname-optimizer=$pkgver-r$pkgrel emscripten-fastcomp>=$pkgver - nodejs python2" +depends="$pkgname-optimizer>=$pkgver emscripten-fastcomp>=$pkgver + nodejs python2 node-closurecompiler-externs" makedepends="binaryen clang cmake" subpackages="$pkgname-optimizer $pkgname-libs-asmjs:libs_asmjs:noarch @@ -23,6 +23,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/kripken/$pkgname/archive/$pk add-system-level-config.patch move-emcc-txt.patch binaryen-wasm-js-path.patch + closurecompiler-externs-path.patch + closurecompiler-language_in-es6.patch embuilder-fix-task-all-for-wasm.patch embuilder-omit-provided.patch emscripten.cfg" @@ -169,6 +171,8 @@ f190ea32dcd4af2661f455ffd8773cb0f7b30ba4a96d22609e11af7186ed1a5c230f3c379d717f23 10a7a545f468a5f71fdf1cca0e0be983db5d21387202b851bd11f811c2a0a74f4e4c8733ae9ff933df4ea49c3f5e8e4e16fc3651bc98bb8c37a0828bb29eca7e add-system-level-config.patch 6613ef4cf41bcf0ecc13a0415cdc847f4ec112f07dd19573000ea6a9a6f2360aee6b2db01f822d117d5022dc58b2421be89fe3421c46fd6857737d07ce489c1e move-emcc-txt.patch a2a2c9b56e8d655b06fdbac2e297e07a0bbcdc3e3df7c913b5caac8ddf20f66b91ed77ac46275adcf8e92baedb5a50cb554c8f3fa59823e17006e17d8d11e820 binaryen-wasm-js-path.patch +1d699aa0ab4b257d58c30ebefd6fbce9a74df964c37f360dcbcaaa6e6c6f4bc8e3f706f32e5855fb6e307d099c7eaca47d07d12a52c83caab43b268fccb606ef closurecompiler-externs-path.patch +5b63f42e4934c7c6d5eedb9e46636a488bc0723618dd0b5d5b720d58cf9d1f6a6e6a768fe1ce1188f86bbb931b6881dfdfc36f8c0584775cb66a9d9e8a2cbb9a closurecompiler-language_in-es6.patch 53bb9b64222dd445e8aefbb5a4b87bc6d562ea578a6f7a04c2605703f0235633583144fe478031e650a7346ba89f6e0aaf6c435aedb8398131fa02940356bc17 embuilder-fix-task-all-for-wasm.patch 3d2fb817ea3e1dd661900df1e27bd135f39076723494b7ffbbe9e1561ae0a0e62a4ed0058301cf3e6b9a13f75adafe58dc902d4a32ade2cb16754a7fd5e542af embuilder-omit-provided.patch 579140e22c086129190026f8d2bcb4ac9bc5783f056c6a9704a74613b17483817ab9cc869c263630cd5b83a347c9d5d26cb67ef74720dbaafe709eb21aa52851 emscripten.cfg diff --git a/testing/emscripten/closurecompiler-externs-path.patch b/testing/emscripten/closurecompiler-externs-path.patch new file mode 100644 index 0000000000..d760156c8d --- /dev/null +++ b/testing/emscripten/closurecompiler-externs-path.patch @@ -0,0 +1,17 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Mon, 4 Apr 2017 19:30:00 +0200 +Subject: [PATCH] Fix path to closurecompiler-externs + +We ship closurecompiler-externs in package node-closurecompiler-externs. + +--- a/tools/shared.py ++++ b/tools/shared.py +@@ -2130,7 +2130,7 @@ + raise Exception('closure compiler check failed') + + CLOSURE_EXTERNS = path_from_root('src', 'closure-externs.js') +- NODE_EXTERNS_BASE = path_from_root('third_party', 'closure-compiler', 'node-externs') ++ NODE_EXTERNS_BASE = '/usr/lib/node_modules/closurecompiler-externs' + NODE_EXTERNS = os.listdir(NODE_EXTERNS_BASE) + NODE_EXTERNS = [os.path.join(NODE_EXTERNS_BASE, name) for name in NODE_EXTERNS + if name.endswith('.js')] diff --git a/testing/emscripten/closurecompiler-language_in-es6.patch b/testing/emscripten/closurecompiler-language_in-es6.patch new file mode 100644 index 0000000000..a1820fd388 --- /dev/null +++ b/testing/emscripten/closurecompiler-language_in-es6.patch @@ -0,0 +1,21 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Mon, 3 Apr 2017 19:39:00 +0200 +Subject: [PATCH] Fix on newer Closure Compiler, change language_in to ES6 + +And also fix name of the compilation_level. + +Upstream-Issue: https://github.com/kripken/emscripten/issues/5109 + +--- a/tools/shared.py ++++ b/tools/shared.py +@@ -2140,8 +2140,8 @@ + args = [JAVA, + '-Xmx' + (os.environ.get('JAVA_HEAP_SIZE') or '1024m'), # if you need a larger Java heap, use this environment variable + '-jar', CLOSURE_COMPILER, +- '--compilation_level', 'ADVANCED_OPTIMIZATIONS', +- '--language_in', 'ECMASCRIPT5', ++ '--compilation_level', 'ADVANCED', ++ '--language_in', 'ECMASCRIPT6', + '--externs', CLOSURE_EXTERNS, + #'--variable_map_output_file', filename + '.vars', + '--js', filename, '--js_output_file', filename + '.cc.js'] |