Skip to content

Commit 65df305

Browse files
committed
3.1.59pre
1 parent 0a7a1be commit 65df305

File tree

4 files changed

+14
-36
lines changed

4 files changed

+14
-36
lines changed

python-wasi-sdk.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ chmod +x ${SDKROOT}/scripts/*
5252

5353
ORIGIN=$(pwd)
5454

55-
# 3.12 3.11 3.10
56-
57-
BUILDS=${BUILDS:-3.12 3.13}
55+
BUILDS=${BUILDS:-3.13}
5856

5957
for PYBUILD in $BUILDS
6058
do

python-wasm-sdk.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ chmod +x ${SDKROOT}/scripts/*
5252

5353
ORIGIN=$(pwd)
5454

55-
# 3.12 3.11 3.10
56-
57-
BUILDS=${BUILDS:-3.12 3.13}
55+
BUILDS=${BUILDS:-3.13}
5856

5957
for PYBUILD in $BUILDS
6058
do

scripts/cpython-build-emsdk-prebuilt.sh

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
. ${CONFIG:-config}
44

5-
CYTHON_REL=${CYTHON_REL:-3.0.8}
5+
CYTHON_REL=${CYTHON_REL:-3.0.10}
66
CYTHON_WHL=${CYTHON:-Cython-${CYTHON_REL}-py2.py3-none-any.whl}
77

88
PIP="${SDKROOT}/python3-wasm -m pip"
@@ -11,45 +11,26 @@ PIP="${SDKROOT}/python3-wasm -m pip"
1111

1212
if echo $PYBUILD|grep -q 3.13$
1313
then
14-
# cython get the latest release on gh install on both host python and build python
15-
pushd build
16-
wget -q -c https://github.com/cython/cython/releases/download/${CYTHON_REL}/${CYTHON_WHL}
17-
$HPIP install --upgrade $CYTHON_WHL
18-
popd
19-
else
2014
echo "
2115
2216
17+
USING CYTHON GIT for $PYBUILD
2318
24-
25-
26-
27-
28-
29-
30-
31-
32-
33-
USING CYTHON GIT
34-
35-
36-
37-
38-
39-
40-
41-
42-
43-
44-
19+
TODO: install in wasm interpreter : $PIP
4520
4621
4722
"
4823
$HPIP install --upgrade git+https://github.com/cython/cython
24+
else
25+
# cython get the latest release on gh install on both host python and build python
26+
pushd build
27+
wget -q -c https://github.com/cython/cython/releases/download/${CYTHON_REL}/${CYTHON_WHL}
28+
$HPIP install --upgrade $CYTHON_WHL
29+
popd
30+
$PIP install build/$CYTHON_WHL
4931
fi
5032

5133

52-
$PIP install build/$CYTHON_WHL
5334

5435

5536
for module in typing_extensions mypy_extensions pyproject-metadata \

scripts/cpython-build-wasisdk.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ END
100100
mv /opt/python-wasm-sdk/devices/wasisdk/usr/lib/libpython${PYBUILD}.a /opt/python-wasm-sdk/wasisdk/
101101
fi
102102

103-
LINKALL="/opt/python-wasm-sdk/wasisdk/libpython3.13.a \
103+
LINKALL="/opt/python-wasm-sdk/wasisdk/libpython${PYBUILD}.a \
104104
/opt/python-wasm-sdk/build/cpython-wasi/Modules/_decimal/libmpdec/libmpdec.a \
105105
/opt/python-wasm-sdk/build/cpython-wasi/Modules/_hacl/libHacl_Hash_SHA2.a \
106106
/opt/python-wasm-sdk/build/cpython-wasi/Modules/expat/libexpat.a \
@@ -109,6 +109,7 @@ END
109109
/opt/python-wasm-sdk/wasisdk/upstream/share/wasi-sysroot/lib/wasm32-wasi/libsqlite3.a \
110110
/opt/python-wasm-sdk/wasisdk/upstream/share/wasi-sysroot/lib/wasm32-wasi/libuuid.a"
111111

112+
# maybe just -nostartfiles ? https://github.com/WebAssembly/wasi-sdk/issues/320
112113
wasi-c -nostdlib -fpic -r -Wl,--whole-archive -o libpython${PYBUILD}.o $LINKALL
113114
llvm-ar rcs ${PREFIX}/lib/libpython${PYBUILD}.a libpython${PYBUILD}.o
114115
popd

0 commit comments

Comments
 (0)