Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pyodide
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
pyodide
Commits
4b3bfe53
Commit
4b3bfe53
authored
Jan 10, 2019
by
Michael Droettboom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade emscripten to 1.38.22
parent
75ed8c05
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
294 additions
and
141 deletions
+294
-141
Makefile
Makefile
+3
-6
Makefile.envs
Makefile.envs
+5
-3
emsdk/Makefile
emsdk/Makefile
+12
-8
emsdk/patches/lz4_c.patch
emsdk/patches/lz4_c.patch
+3
-3
emsdk/patches/num_params.patch
emsdk/patches/num_params.patch
+2
-2
tools/file_packager.py
tools/file_packager.py
+269
-119
No files found.
Makefile
View file @
4b3bfe53
...
...
@@ -68,8 +68,6 @@ build/pyodide.asm.js: src/main.bc src/jsimport.bc src/jsproxy.bc src/js2python.b
[
-d
build
]
||
mkdir
build
$(CXX)
-s
EXPORT_NAME
=
"'pyodide'"
-o
build/pyodide.asm.html
$(
filter
%.bc,
$^
)
\
$(LDFLAGS)
-s
FORCE_FILESYSTEM
=
1
rm
build/pyodide.asm.asm.js
rm
build/pyodide.asm.wasm.pre
rm
build/pyodide.asm.html
...
...
@@ -149,7 +147,7 @@ build/test.data: $(CPYTHONLIB)
)
(
\
cd
build
;
\
python
$(FILEPACKAGER)
test.data
--lz4
--preload
../
$(CPYTHONLIB)
/test@/lib/python3.7/test
--js-output
=
test.js
--export-name
=
pyodide._module
--exclude
\*
.wasm.pre
--exclude
__pycache__
\
python
$(FILEPACKAGER)
test.data
--lz4
--preload
../
$(CPYTHONLIB)
/test@/lib/python3.7/test
--js-output
=
test.js
--export-name
=
pyodide._module
--exclude
__pycache__
\
)
uglifyjs build/test.js
-o
build/test.js
...
...
@@ -174,7 +172,6 @@ root/.built: \
cd
root/lib/python
$(PYMINOR)
;
\
rm
-fr
`
cat
../../../remove_modules.txt
`
;
\
rm
-fr
test
;
\
find
.
-name
"*.wasm.pre"
-type
f
-delete
;
\
find
-type
d
-name
__pycache__
-prune
-exec
rm
-rf
{}
\;
\
)
touch
root/.built
...
...
@@ -185,7 +182,7 @@ ccache/emcc:
if
hash
ccache &>/dev/null
;
then
\
ln
-s
`
which ccache
`
$(PYODIDE_ROOT)
/ccache/emcc
;
\
else
\
ln
-s
emsdk/emsdk/emscripten/tag-
1.38.12
/emcc
$(PYODIDE_ROOT)
/ccache/emcc
;
\
ln
-s
emsdk/emsdk/emscripten/tag-
$(EMSCRIPTEN_VERSION)
/emcc
$(PYODIDE_ROOT)
/ccache/emcc
;
\
fi
...
...
@@ -194,7 +191,7 @@ ccache/em++:
if
hash
ccache &>/dev/null
;
then
\
ln
-s
`
which ccache
`
$(PYODIDE_ROOT)
/ccache/em++
;
\
else
\
ln
-s
emsdk/emsdk/emscripten/tag-
1.38.12
/em++
$(PYODIDE_ROOT)
/ccache/em++
;
\
ln
-s
emsdk/emsdk/emscripten/tag-
$(EMSCRIPTEN_VERSION)
/em++
$(PYODIDE_ROOT)
/ccache/em++
;
\
fi
...
...
Makefile.envs
View file @
4b3bfe53
export
PATH
:=
$(PYODIDE_ROOT)
/ccache:
$(PYODIDE_ROOT)
/emsdk/emsdk:
$(PYODIDE_ROOT)
/emsdk/emsdk/clang/tag-e1.38.12/build_tag-e1.38.12_64/bin:
$(PYODIDE_ROOT)
/emsdk/emsdk/node/8.9.1_64bit/bin:
$(PYODIDE_ROOT)
/emsdk/emsdk/emscripten/tag-1.38.12:
$(PYODIDE_ROOT)
/emsdk/emsdk/binaryen/tag-1.38.12_64bit_binaryen/bin:
$(PATH)
export
EMSCRIPTEN_VERSION
=
1.38.22
export
PATH
:=
$(PYODIDE_ROOT)
/ccache:
$(PYODIDE_ROOT)
/emsdk/emsdk:
$(PYODIDE_ROOT)
/emsdk/emsdk/clang/tag-e
$(EMSCRIPTEN_VERSION)
/build_tag-e
$(EMSCRIPTEN_VERSION)
_64/bin:
$(PYODIDE_ROOT)
/emsdk/emsdk/node/8.9.1_64bit/bin:
$(PYODIDE_ROOT)
/emsdk/emsdk/emscripten/tag-
$(EMSCRIPTEN_VERSION)
:
$(PYODIDE_ROOT)
/emsdk/emsdk/binaryen/tag-
$(EMSCRIPTEN_VERSION)
_64bit_binaryen/bin:
$(PATH)
export
EMSDK
=
$(PYODIDE_ROOT)
/emsdk/emsdk
export
EM_CONFIG
=
$(PYODIDE_ROOT)
/emsdk/emsdk/.emscripten
export
EM_CACHE
=
$(PYODIDE_ROOT)
/emsdk/emsdk/.emscripten_cache
export
EMSCRIPTEN
=
$(PYODIDE_ROOT)
/emsdk/emsdk/emscripten/tag-
1.38.12
export
BINARYEN_ROOT
=
$(PYODIDE_ROOT)
/emsdk/emsdk/binaryen/tag-
1.38.12
_64bit_binaryen
export
EMSCRIPTEN
=
$(PYODIDE_ROOT)
/emsdk/emsdk/emscripten/tag-
$(EMSCRIPTEN_VERSION)
export
BINARYEN_ROOT
=
$(PYODIDE_ROOT)
/emsdk/emsdk/binaryen/tag-
$(EMSCRIPTEN_VERSION)
_64bit_binaryen
export
PYVERSION
=
3.7.0
export
PYMINOR
=
$(
basename
$(PYVERSION)
)
...
...
emsdk/Makefile
View file @
4b3bfe53
PYODIDE_ROOT
=
$(
abspath
..
)
include
../Makefile.envs
all
:
emsdk/.complete
# We hack the CPU_CORES, because if you use all of the cores on Circle-CI, you
...
...
@@ -8,14 +11,15 @@ emsdk/.complete:
git clone https://github.com/juj/emsdk.git
sed
-i
-e
"s#CPU_CORES = max(multiprocessing.cpu_count()-1, 1)#CPU_CORES = 3#g"
emsdk/emsdk
(
\
cd
emsdk
;
\
./emsdk
install
--build
=
Release sdk-tag-1.38.12-64bit binaryen-tag-1.38.12-64bit
;
\
cd
..
;
\
(
cat
patches/
*
.patch | patch
-p1
)
;
\
cd
emsdk/binaryen/tag-1.38.12_64bit_binaryen/
;
\
make
;
\
cd
../..
;
\
./emsdk activate
--embedded
--build
=
Release sdk-tag-1.38.12-64bit binaryen-tag-1.38.12-64bit
;
\
cd
emsdk
&&
\
./emsdk
install
--build
=
Release sdk-tag-
$(EMSCRIPTEN_VERSION)
-64bit
binaryen-tag-
$(EMSCRIPTEN_VERSION)
-64bit
&&
\
cd
..
&&
\
(
cat
patches/
*
.patch | patch
-p1
)
&&
\
cd
emsdk/binaryen/tag-
$(EMSCRIPTEN_VERSION)
_64bit_binaryen/
&&
\
make
&&
\
cd
../..
&&
\
cp
binaryen/tag-
$(EMSCRIPTEN_VERSION)
/bin/wasm.js binaryen/tag-
$(EMSCRIPTEN_VERSION)
_64bit_binaryen/bin
&&
\
./emsdk activate
--embedded
--build
=
Release sdk-tag-
$(EMSCRIPTEN_VERSION)
-64bit
binaryen-tag-
$(EMSCRIPTEN_VERSION)
-64bit
&&
\
touch
.complete
\
)
...
...
emsdk/patches/lz4_c.patch
View file @
4b3bfe53
diff --git a/emsdk/emscripten/tag-1.38.
12/src/library_lz4.js b/emsdk/emscripten/tag-1.38.1
2/src/library_lz4.js
diff --git a/emsdk/emscripten/tag-1.38.
22/src/library_lz4.js b/emsdk/emscripten/tag-1.38.2
2/src/library_lz4.js
index 4c3f583b7..5291002a4 100644
--- a/emsdk/emscripten/tag-1.38.
1
2/src/library_lz4.js
+++ b/emsdk/emscripten/tag-1.38.
1
2/src/library_lz4.js
--- a/emsdk/emscripten/tag-1.38.
2
2/src/library_lz4.js
+++ b/emsdk/emscripten/tag-1.38.
2
2/src/library_lz4.js
@@ -5,26 +5,14 @@
mergeInto(LibraryManager.library, {
DIR_MODE: {{{ cDefine('S_IFDIR') }}} | 511 /* 0777 */,
FILE_MODE: {{{ cDefine('S_IFREG') }}} | 511 /* 0777 */,
...
...
emsdk/patches/num_params.patch
View file @
4b3bfe53
diff --git a/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp b/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp
index 013e9403..d95fc282 100644
--- a/emsdk/binaryen/tag-1.38.
1
2/src/passes/FuncCastEmulation.cpp
+++ b/emsdk/binaryen/tag-1.38.
1
2/src/passes/FuncCastEmulation.cpp
--- a/emsdk/binaryen/tag-1.38.
2
2/src/passes/FuncCastEmulation.cpp
+++ b/emsdk/binaryen/tag-1.38.
2
2/src/passes/FuncCastEmulation.cpp
@@ -39,7 +39,7 @@
namespace wasm {
// This should be enough for everybody. (As described above, we need this
// to match when dynamically linking, and also dynamic linking is why we
...
...
tools/file_packager.py
View file @
4b3bfe53
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment