Skip to content

Commit

Permalink
3.1.68 rel
Browse files Browse the repository at this point in the history
  • Loading branch information
pmp-p committed Oct 1, 2024
1 parent 4ceaf3c commit 1ceb82c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-22.04
env:
BUILDS: 3.12 3.13
EMFLAVOUR: tot
EMFLAVOUR: 3.1.68

steps:
- uses: actions/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions scripts/cpython-build-emsdk-prebuilt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

. ${CONFIG:-config}

CYTHON_REL=${CYTHON_REL:-3.0.10}
CYTHON_REL=${CYTHON_REL:-3.0.11}
CYTHON_WHL=${CYTHON:-Cython-${CYTHON_REL}-py2.py3-none-any.whl}

PIP="${SDKROOT}/python3-wasm -m pip"
Expand Down Expand Up @@ -38,8 +38,8 @@ then
"
$PIP install --upgrade --no-build-isolation git+https://github.com/cython/cython
$HPIP install --upgrade --force git+https://github.com/cython/cython
$PIP install --upgrade --no-build-isolation git+https://github.com/pygame-web/cython.git
$HPIP install --upgrade --force git+https://github.com/pygame-web/cython.git
else
# cython get the latest release on gh install on both host python and build python
pushd build
Expand Down
2 changes: 1 addition & 1 deletion scripts/cpython-build-emsdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ END
sed -i 's|-sWASM_BIGINT||g' configure.ac

# do not mess with wasm sysconfig name
if echo $PYBUILD|grep -q 13$
if echo $PYBUILD|grep -q 3\\.13$
then
GIL="--disable-gil"
sed -i 's|{ABIFLAGS}t|{ABIFLAGS}|g' configure
Expand Down
2 changes: 1 addition & 1 deletion scripts/cpython-build-host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ END
END

if echo $PYBUILD|grep -q 3.13$
if echo $PYBUILD|grep -q 3\\.13$
then
# Prevent freezing bytecode with a different magic
rm -f $HOST_PREFIX/bin/python3 $HOST_PREFIX/bin/python${PYBUILD}
Expand Down
8 changes: 7 additions & 1 deletion support/__EMSCRIPTEN__.embed/emscriptenmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -873,5 +873,11 @@ extern PyObject *PyInit_emscripten();
#endif

PyObject *PyInit_emscripten() {
return PyModule_Create(&emscripten_module);
#ifdef Py_GIL_DISABLED
PyObject *emscripten_mod = PyModule_Create(&emscripten_module);
PyUnstable_Module_SetGIL(emscripten_mod, Py_MOD_GIL_NOT_USED);
return emscripten_mod;
#else
return PyModule_Create(&emscripten_module);
#endif
}

0 comments on commit 1ceb82c

Please sign in to comment.