Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-20 09:45:12 +03:00
Code Issues Wiki Activity

testing/emscripten: fix issues with Closure Compiler

Browse source 
And relax version bound for emscripten-optimizer.
This commit is contained in:
Jakub Jirutka 2017-04-03 19:51:18 +02:00
parent 911d1a0406
commit c80e424f4e
3 changed files with 45 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
testing/emscripten/APKBUILD
View file

@ -6,13 +6,13 @@
pkgname=emscripten pkgname=emscripten
# Keep with sync with pkg emscrypten-fastcomp! # Keep with sync with pkg emscrypten-fastcomp!
pkgver=1.37.9 pkgver=1.37.9
pkgrel=0 pkgrel=2
pkgdesc="An LLVM-to-JavaScript Compiler" pkgdesc="An LLVM-to-JavaScript Compiler"
url="https://kripken.github.io/emscripten-site/" url="https://kripken.github.io/emscripten-site/"
arch="all" arch="all"
license="MIT UOI-NCSA" license="MIT UOI-NCSA"
depends="$pkgname-optimizer=$pkgver-r$pkgrel emscripten-fastcomp>=$pkgver depends="$pkgname-optimizer>=$pkgver emscripten-fastcomp>=$pkgver
nodejs python2" nodejs python2 node-closurecompiler-externs"
makedepends="binaryen clang cmake" makedepends="binaryen clang cmake"
subpackages="$pkgname-optimizer subpackages="$pkgname-optimizer
$pkgname-libs-asmjs:libs_asmjs:noarch $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 add-system-level-config.patch
move-emcc-txt.patch move-emcc-txt.patch
binaryen-wasm-js-path.patch binaryen-wasm-js-path.patch
closurecompiler-externs-path.patch
closurecompiler-language_in-es6.patch
embuilder-fix-task-all-for-wasm.patch embuilder-fix-task-all-for-wasm.patch
embuilder-omit-provided.patch embuilder-omit-provided.patch
emscripten.cfg" emscripten.cfg"
@ -169,6 +171,8 @@ f190ea32dcd4af2661f455ffd8773cb0f7b30ba4a96d22609e11af7186ed1a5c230f3c379d717f23
10a7a545f468a5f71fdf1cca0e0be983db5d21387202b851bd11f811c2a0a74f4e4c8733ae9ff933df4ea49c3f5e8e4e16fc3651bc98bb8c37a0828bb29eca7e add-system-level-config.patch 10a7a545f468a5f71fdf1cca0e0be983db5d21387202b851bd11f811c2a0a74f4e4c8733ae9ff933df4ea49c3f5e8e4e16fc3651bc98bb8c37a0828bb29eca7e add-system-level-config.patch
6613ef4cf41bcf0ecc13a0415cdc847f4ec112f07dd19573000ea6a9a6f2360aee6b2db01f822d117d5022dc58b2421be89fe3421c46fd6857737d07ce489c1e move-emcc-txt.patch 6613ef4cf41bcf0ecc13a0415cdc847f4ec112f07dd19573000ea6a9a6f2360aee6b2db01f822d117d5022dc58b2421be89fe3421c46fd6857737d07ce489c1e move-emcc-txt.patch
a2a2c9b56e8d655b06fdbac2e297e07a0bbcdc3e3df7c913b5caac8ddf20f66b91ed77ac46275adcf8e92baedb5a50cb554c8f3fa59823e17006e17d8d11e820 binaryen-wasm-js-path.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 53bb9b64222dd445e8aefbb5a4b87bc6d562ea578a6f7a04c2605703f0235633583144fe478031e650a7346ba89f6e0aaf6c435aedb8398131fa02940356bc17 embuilder-fix-task-all-for-wasm.patch
3d2fb817ea3e1dd661900df1e27bd135f39076723494b7ffbbe9e1561ae0a0e62a4ed0058301cf3e6b9a13f75adafe58dc902d4a32ade2cb16754a7fd5e542af embuilder-omit-provided.patch 3d2fb817ea3e1dd661900df1e27bd135f39076723494b7ffbbe9e1561ae0a0e62a4ed0058301cf3e6b9a13f75adafe58dc902d4a32ade2cb16754a7fd5e542af embuilder-omit-provided.patch
579140e22c086129190026f8d2bcb4ac9bc5783f056c6a9704a74613b17483817ab9cc869c263630cd5b83a347c9d5d26cb67ef74720dbaafe709eb21aa52851 emscripten.cfg 579140e22c086129190026f8d2bcb4ac9bc5783f056c6a9704a74613b17483817ab9cc869c263630cd5b83a347c9d5d26cb67ef74720dbaafe709eb21aa52851 emscripten.cfg

17
testing/emscripten/closurecompiler-externs-path.patch Normal file
View file

@ -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')]

21
testing/emscripten/closurecompiler-language_in-es6.patch Normal file
View file

@ -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']