From dca09dc7d59d1d0861ccd68ff60b1fb17f5e5b33 Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Thu, 10 Oct 2024 03:53:34 +0200
Subject: [PATCH] skip 3.12

---
 .github/workflows/ci.yml                |  2 +-
 config                                  |  4 +++-
 scripts/cpython-build-emsdk-prebuilt.sh | 17 ++++++++++++-----
 scripts/cpython-build-emsdk.sh          |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf42648..cece5bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     env:
-       BUILDS: 3.12 3.13 3.14
+       BUILDS: 3.13 3.14
        EMFLAVOUR: tot
     
     steps:
diff --git a/config b/config
index 9033b5a..ace7afc 100644
--- a/config
+++ b/config
@@ -117,7 +117,9 @@ export NIMSDK=${NIMSDK:-"${SDKROOT}/nimsdk"}
 # EXTRABINS="$EXTRABINS $NIMSDK/bin"
 
 # ================ go =====================
-
+export GOPRIVATE=*
+export GONOPROXY=*
+export GONOSUMDB=*
 export GOMODCACHE=$XDG_CACHE_HOME
 export GOPATH=$SDKROOT/go
 export GOROOT=$SDKROOT/go
diff --git a/scripts/cpython-build-emsdk-prebuilt.sh b/scripts/cpython-build-emsdk-prebuilt.sh
index 657fc3e..b1dbe48 100755
--- a/scripts/cpython-build-emsdk-prebuilt.sh
+++ b/scripts/cpython-build-emsdk-prebuilt.sh
@@ -16,13 +16,19 @@ PIP="${SDKROOT}/python3-wasm -m pip"
 $HPIP install \
  trove-classifiers pluggy pathspec packaging hatchling \
  typing_extensions mypy_extensions pyproject_hooks pyproject-metadata \
- build pyparsing packaging hatchling setuptools_scm meson-python \
+ build pyparsing packaging hatchling setuptools_scm \
+ docutils setuptools meson meson-python \
  idna urllib3 charset_normalizer certifi tomli requests flit pip
 
 
 # all needed for PEP722/723, hpy, cffi modules and wheel building
+# those may contain tiny fixes for wasm and/or current unreleased cpython.
 
-for module in /data/git/flit/flit_core \
+pushd src
+    git clone --no-tags --depth 1 --single-branch --branch main https://github.com/pygame-web/flit
+popd
+
+for module in src/flit/flit_core \
  git+https://github.com/pygame-web/wheel \
  git+https://github.com/pygame-web/setuptools \
  git+https://github.com/python-cffi/cffi \
@@ -59,12 +65,13 @@ then
 
 "
     # $HPIP install setuptools
-    $HPIP install --upgrade --no-build-isolation --force git+https://github.com/pygame-web/cython.git
+    # compiling cython is way too slow so just get it pure with NO_CYTHON_COMPILE=true
+    NO_CYTHON_COMPILE=true $HPIP install --upgrade --no-build-isolation --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
-    wget -q -c https://github.com/cython/cython/releases/download/${CYTHON_REL}/${CYTHON_WHL}
-    $HPIP install --upgrade $CYTHON_WHL
+        wget -q -c https://github.com/cython/cython/releases/download/${CYTHON_REL}/${CYTHON_WHL}
+        $HPIP install --upgrade $CYTHON_WHL
     popd
     $PIP install build/$CYTHON_WHL
 fi
diff --git a/scripts/cpython-build-emsdk.sh b/scripts/cpython-build-emsdk.sh
index 5d3b42d..fcd086e 100755
--- a/scripts/cpython-build-emsdk.sh
+++ b/scripts/cpython-build-emsdk.sh
@@ -228,7 +228,7 @@ END
     # prevent an error in install when byte compiling is disabled.
     mkdir -p ${ROOT}/devices/emsdk/usr/lib/python${PYMAJOR}.${PYMINOR}/lib-dynload/__pycache__
 
-    emmake make -j$NPROC WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ || exit 255
+    emmake make -j$(nproc) WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ || exit 255
     sed -i 's|   -lcrypto||g' Makefile
     emmake make -j1 Modules/_ctypes/_ctypes.o
     if emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install