3.1.63pre

Author: pmp-p

scripts/cpython-build-emsdk-prebuilt.sh

@@ -9,6 +9,21 @@ PIP="${SDKROOT}/python3-wasm -m pip"
 
 # all needed for PEP722/723, hpy, cffi modules and wheel building
 
+for module in flit git+https://github.com/pygame-web/wheel \
+ typing_extensions mypy_extensions pyproject-metadata \
+ git+https://github.com/pygame-web/setuptools build pyparsing packaging hatchling setuptools_scm \
+ git+https://github.com/python-cffi/cffi meson-python git+https://github.com/pypa/installer
+do
+    $PIP install --no-build-isolation --force $module
+    if $HPIP install --upgrade --force "$module"
+    then
+        echo "  pre-installing $module"  1>&2
+    else
+        echo "  TARGET FAILED on required module $module" 1>&2
+        exit 23
+    fi
+done
+
 if echo $PYBUILD|grep -q 3.13$
 then
     echo "
@@ -21,6 +36,7 @@ then
 
 "
     $HPIP install --upgrade git+https://github.com/cython/cython
+    $PIP install --upgrade --no-build-isolation git+https://github.com/cython/cython
 else
     # cython get the latest release on gh install on both host python and build python
     pushd build
@@ -31,22 +47,6 @@ else
 fi
 
 
-
-
-for module in typing_extensions mypy_extensions pyproject-metadata \
- setuptools build wheel pyparsing packaging hatchling setuptools_scm \
- git+https://github.com/python-cffi/cffi meson-python git+https://github.com/pypa/installer
-do
-    $PIP install --force $module
-    if $HPIP install --upgrade --force "$module"
-    then
-        echo "  pre-installing $module"  1>&2
-    else
-        echo "  TARGET FAILED on required module $module" 1>&2
-        exit 23
-    fi
-done
-
 # cannot use wasi ninja yet
 $HPIP install --force ninja
 

scripts/cpython-build-host.sh

@@ -23,18 +23,13 @@ else
     fi
 fi
 
-# in this special case build testsuite
-# main repo https://github.com/pmp-p/python-wasm-plus
-
+# special case build testsuite
 # pygame-web won't build test modules
-
-if echo $GITHUB_WORKSPACE|grep -q /python-wasm-plus/
+if echo $GITHUB_WORKSPACE|grep -q /python-wasm-sdk/
 then
-    TESTSUITE="--enable-test-modules"
-    #TESTSUITE=""
+    TESTSUITE=""
 else
     TESTSUITE="--enable-test-modules"
-    #TESTSUITE=""
 fi
 
 echo "
@@ -104,11 +99,14 @@ END
             " 1>&2
             sleep 6
         fi
+        GIL="--disable-gil"
+    else
+        GIL=""
     fi
 
     if CC=clang CXX=clang++ CFLAGS="-fPIC" CPPFLAGS="-fPIC" \
      ${ROOT}/src/cpython${PYBUILD}/configure \
-     --prefix=$HOST_PREFIX $PYOPTS
+     --prefix=$HOST_PREFIX $PYOPTS $GIL
     then
         if make -j$(nproc) install
         then
@@ -117,24 +115,6 @@ END
             echo "failed to build $PYTHON_FOR_BUILD"  1>&2
             exit 118
         fi
-
-#        if make -j$(nproc) install
-#        then
-#            rm -rf $(find $ROOT/devices/ -type d|grep __pycache__$)
-#            rm $HOST_PREFIX/bin/python3-config \
-#                $HOST_PREFIX/bin/idle3 \
-#                $HOST_PREFIX/bin/pydoc3 \
-#                $HOST_PREFIX/bin/python3
-
-#            # make ubuntu binaries able to run elsewhere
-#            patchelf --remove-needed libintl.so.8  $HOST_PREFIX/bin/python${PYBUILD}
-#            # and able to compile elsewhere
-#            sed -i 's|-lintl ||g' ${SDKROOT}/devices/x86_64/usr/bin/python${PYBUILD}-config
-#            cp -Rfv $ROOT/support/__EMSCRIPTEN__.patches/${PYBUILD}/. $HOST_PREFIX/lib/python${PYBUILD}/
-#        else
-#            echo "failed to build $PYTHON_FOR_BUILD"
-#            exit 123
-#        fi
     else
         echo "
 ==========================================================================

scripts/cpython-fetch.sh

@@ -49,6 +49,10 @@ then
     tar xf Python-3.13.0b3.tar.xz
     ln -s Python-3.13.0b3 cpython${PYBUILD}
 
+    pushd cpython${PYBUILD}
+
+    popd
+
 fi
 
 if echo $PYBUILD |grep -q 12$