3.1.45pre (3.12)

Author: pmp-p

scripts/cpython-build-emsdk.sh

@@ -179,6 +179,7 @@ END
     touch ${PYTHONPYCACHEPREFIX}/empty/$($HPY -V|cut -f2 -d' ')
 
     #echo "#define HAVE_NCURSES_H" >> pyconfig.h
+
     if echo $PYBUILD|grep -q 3.10
     then
         cat > Modules/Setup.local <<END
@@ -203,9 +204,7 @@ _crypt
 _ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c ${SDKROOT}/emsdk/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/pic/libffi.a
 
 END
-
-
-fi
+    fi
 
     if emmake make -j$NPROC WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/
     then

scripts/cpython-build-host-deps.sh

@@ -7,4 +7,8 @@ echo "
 " 1>&2
 
 
-# use system packages.
+# install critical packages.
+
+
+# 3.12 and git deprecated setuptools bundling.
+$PIP install --upgrade setuptools

scripts/cpython-fetch.sh

@@ -17,6 +17,29 @@ PYPATCH=true
 
 [ -f $HPY ] || REBUILD=true
 
+if echo $PYBUILD |grep -q 13$
+then
+    if [ -d cpython${PYBUILD} ]
+    then
+        pushd cpython${PYBUILD} 2>&1 >/dev/null
+        # put the tree back to original state so we can pull
+        # Programs/python.c Modules/readline.c
+        git restore .
+
+        if git pull|grep -q 'Already up to date'
+        then
+            export REBUILD=${REBUILD:-false}
+        else
+            export REBUILD=true
+        fi
+        #not here or pip won't install properly anymore its wheels
+        #cat $ROOT/support/compilenone.py > ./Lib/compileall.py
+        popd
+    else
+        git clone --no-tags --depth 1 --single-branch --branch main https://github.com/python/cpython.git cpython${PYBUILD}
+        export REBUILD=true
+    fi
+fi
 
 if echo $PYBUILD |grep -q 12$
 then
@@ -37,7 +60,7 @@ then
         #cat $ROOT/support/compilenone.py > ./Lib/compileall.py
         popd
     else
-        git clone --no-tags --depth 1 --single-branch --branch main https://github.com/python/cpython.git cpython${PYBUILD}
+        git clone --no-tags --depth 1 --single-branch --branch 3.12 https://github.com/python/cpython.git cpython${PYBUILD}
         export REBUILD=true
     fi
 fi
@@ -74,15 +97,16 @@ fi
 
 
 # the sys._emscripten_info is actually not compatible with shared build
-# just move its stuff to main
+# because it uses javascript inlines
+# just move it to main
 
 if $NOPATCH
 then
     echo -n
 else
     # do some patching for 3.11+ to allow more shared libs
     pushd src/cpython${PYBUILD} 2>&1 >/dev/null
-    patch -p1 < ../../support/__EMSCRIPTEN__.embed/cpython.diff
+    patch -p1 < ../../support/__EMSCRIPTEN__.embed/cpython${PYBUILD}.diff
     popd 2>&1 >/dev/null
 fi
 

scripts/emsdk-fetch.sh

@@ -114,8 +114,7 @@ END
         # sdl2_image is too old
         ALL="libembind libgl libal libhtml5 libstubs libnoexit libsockets"
         ALL="$ALL libc libdlmalloc libcompiler_rt libc++-noexcept libc++abi-noexcept"
-        ALL="$ALL struct_info libfetch zlib bzip2"
-        ALL="$ALL libpng libjpeg freetype harfbuzz"
+        ALL="$ALL libfetch zlib bzip2 libpng libjpeg freetype harfbuzz"
         ALL="$ALL sdl2 sdl2_mixer sdl2_gfx sdl2_ttf"
         ALL="$ALL sqlite3"
 

support/__EMSCRIPTEN__.embed/cpython.diff renamed to support/__EMSCRIPTEN__.embed/cpython3.11.diff

@@ -0,0 +1,38 @@
+--- cpython/Python/sysmodule.c	2023-08-20 14:05:54.398071771 +0200
++++ cpython3.12/Python/sysmodule.c	2023-08-20 14:04:34.785129849 +0200
+@@ -50,7 +50,7 @@
+ extern const char *PyWin_DLLVersionString;
+ #endif
+ 
+-#ifdef __EMSCRIPTEN__
++#if 0
+ #include <emscripten.h>
+ #endif
+ 
+@@ -3136,7 +3136,7 @@
+     return NULL;
+ }
+ 
+-#ifdef __EMSCRIPTEN__
++#if 0
+ 
+ PyDoc_STRVAR(emscripten_info__doc__,
+ "sys._emscripten_info\n\
+@@ -3368,7 +3368,7 @@
+         goto type_init_failed;
+     }
+ 
+-#ifdef __EMSCRIPTEN__
++#if 0
+     if (EmscriptenInfoType == NULL) {
+         EmscriptenInfoType = PyStructSequence_NewType(&emscripten_info_desc);
+         if (EmscriptenInfoType == NULL) {
+@@ -3641,7 +3641,7 @@
+ #endif
+     _PyStructSequence_FiniBuiltin(interp, &Hash_InfoType);
+     _PyStructSequence_FiniBuiltin(interp, &AsyncGenHooksType);
+-#ifdef __EMSCRIPTEN__
++#if 0
+     if (_Py_IsMainInterpreter(interp)) {
+         Py_CLEAR(EmscriptenInfoType);
+     }