File tree Expand file tree Collapse file tree 7 files changed +85
-7
lines changed Expand file tree Collapse file tree 7 files changed +85
-7
lines changed Original file line number Diff line number Diff line change 4747
4848export EMFLAVOUR=${EMFLAVOUR:- tot}
4949
50+ # no extra wasm features
51+ export WASMFLAVOUR=mvp
52+
5053# temp fix for oom on CI (Error: Process completed with exit code 143.)
5154export EMSDK_NUM_CORES=1
5255
5356
54- export PYDK_PYTHON_HOST_PLATFORM=wasm32-$EMFLAVOUR -emscripten
57+ export PYDK_PYTHON_HOST_PLATFORM=wasm32-$WASMFLAVOUR -emscripten
5558
5659if echo $LD_LIBRARY_PATH | grep -q ${HOST_PREFIX} /lib
5760then
Original file line number Diff line number Diff line change 1+ patchelf wget lz4 pv clang libffi-dev libssl-dev libsqlite3-dev pkg-config git
Original file line number Diff line number Diff line change 7070 if ./scripts/cpython-build-emsdk-deps.sh > /dev/null
7171 then
7272 [ -f /lowend ] && sleep 45
73+
74+
75+ echo " --------- adding some usefull pkg ${PYBUILD} ${CIVER} ---------" 1>&2
76+ ./scripts/cpython-build-emsdk-prebuilt.sh
77+
78+
7379 echo "
7480
7581 ==========================================================
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+
3+ . ${CONFIG:- config}
4+
5+ PIP=" $( realpath python3-wasm) -m pip"
6+
7+ echo "
8+ * cpython-build-emsdk-prebuilt pip==$PIP *
9+ " 1>&2
10+
11+ # make wheels
12+ # /opt/python-wasm-sdk/python3-wasm setup.py bdist_wheel
13+
14+ for pkg in wheel installer
15+ do
16+ if [ -d prebuilt/emsdk/${PYBUILD} /site-packages/$pkg ]
17+ then
18+ echo "
19+ $pkg already set to prebuilt
20+ "
21+ else
22+ $PIP install $pkg
23+ mv $PREFIX /lib/python${PYBUILD} /site-packages/${pkg} prebuilt/emsdk/${PYBUILD} /site-packages/
24+ mv $PREFIX /lib/python${PYBUILD} /site-packages/${pkg} -* prebuilt/emsdk/${PYBUILD} /site-packages/
25+ fi
26+ done
27+
28+
29+ pushd src
30+
31+ CYTHON=Cython-3.0.0a11-py2.py3-none-any.whl
32+
33+ wget -q -c https://github.com/cython/cython/releases/download/3.0.0a11/${CYTHON}
34+ $PIP install $CYTHON
35+
36+
37+
38+
39+
40+
41+
42+
43+
44+
45+
46+
47+
48+
49+
50+
51+
52+
53+
54+
55+
56+
57+
58+
59+
60+
61+
62+
63+
64+
65+
66+
67+ popd
Original file line number Diff line number Diff line change @@ -18,7 +18,6 @@ export PYTHON_FOR_BUILD=${PYTHON_FOR_BUILD:-${HPY}}
1818
1919. ./scripts/emsdk-fetch.sh
2020
21-
2221REBUILD_WASM=${REBUILD_WASMPY:- false}
2322
2423if $REBUILD || $REBUILD_WASMPY
3736 popd 2>&1 > /dev/null
3837fi
3938
40-
4139if [ -f $EMSDK /upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/pic/libffi.a ]
4240then
4341 echo "
@@ -119,7 +117,6 @@ echo "
119117
120118
121119
122-
123120 ********** TESTSUITE test-modules == $TESTSUITE *******************
124121
125122
@@ -338,6 +335,11 @@ export PYBUILD=\${PYBUILD:-$PYBUILD}
338335export PYMAJOR=\$ (echo -n \$ PYBUILD|cut -d. -f1)
339336export PYMINOR=\$ (echo -n \$ PYBUILD|cut -d. -f2)
340337
338+ export CARGO_HOME=\$ {CARGO_HOME:-/opt/python-rust-sdk}
339+ export RUSTUP_HOME=\$ {RUSTUP_HOME:-/opt/python-rust-sdk}
340+ export PATH=\$ {CARGO_HOME}/bin:$PATH
341+
342+
341343if [[ ! -z \$ {EMSDK+z} ]]
342344then
343345 # emsdk_env already parsed
352354export SYS_PYTHON=${SYS_PYTHON}
353355export EMSDK_PYTHON=${SYS_PYTHON}
354356
355- export PATH=${HOST_PREFIX} /bin:\$ PATH
357+ export PATH=${HOST_PREFIX} /bin:\$ PATH: ${SDKROOT} /devices/emsdk/usr/bin
356358export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
357359export HOME=${SDKROOT}
358360export PLATFORM_TRIPLET=${PYDK_PYTHON_HOST_PLATFORM}
Original file line number Diff line number Diff line change 5757 unset CPPFLAGS
5858 unset LDFLAGS
5959
60-
6160# export OPT="$CPOPTS -DNDEBUG -fwrapv"
61+ mkdir -p $ROOT /src/cpython${PYBUILD} /Tools/wasm
6262 cat > $ROOT /src/cpython${PYBUILD} /Tools/wasm/config.host-wasm32-emscripten << END
6363ac_cv_lib_intl_textdomain=no
6464ac_cv_func_bind_textdomain_codeset=no
Original file line number Diff line number Diff line change 209209 echo " emsdk: config already set !" 1>&2
210210fi
211211
212-
You can’t perform that action at this time.
0 commit comments