try static load ( not using builtins )

Author: pmp-p

buildapp.sh

@@ -1,7 +1,27 @@
 #!/bin/bash
-reset
+
 export ROOT=$(pwd)
 
+while true
+do
+    echo Waiting for pygame build to complete ...
+
+    [ -f ${ROOT}/prebuilt/emsdk/libpygame.a ] && break
+    sleep 1
+
+    [ -f ${ROOT}/prebuilt/emsdk/libpygame.a ] && break
+    sleep 1
+
+    [ -f ${ROOT}/prebuilt/emsdk/libpygame.a ] && break
+    sleep 1
+
+    [ -f ${ROOT}/prebuilt/emsdk/libpygame.a ] && break
+    sleep 1
+
+done
+reset
+
+
 . ${CONFIG:-config}
 
 EXE=python311

config

@@ -9,6 +9,8 @@ export CI=${CI:-false}
 
 export PYMAJOR=3
 export PYBUILD=${PYBUILD:-${PYMAJOR}.11}
+export PYMINOR=$(echo -n $PYBUILD|cut -d. -f2)
+
 
 export HOST_PREFIX=${HOST_PREFIX:-${SDKROOT}/devices/$(arch)/usr}
 export PREFIX=${PREFIX:-${SDKROOT}/devices/emsdk/usr}

scripts/cpython-build-host-deps.sh

@@ -1,7 +1,7 @@
 . ${CONFIG:-config}
 
 echo "
-    *cpython-build-host-deps pip==$PIP *
+    *   cpython-build-host-deps pip==$PIP   *
 " 1>&2
 
 

scripts/cpython-build-host.sh

@@ -9,7 +9,7 @@ mkdir -p build/cpython-host
 if $REBUILD
 then
     echo "
-    * building cpython $PYBUILD $CIVER
+    * building CPython $PYBUILD for $CIVER
 "
 else
     if [ -f ${PYTHON_FOR_BUILD} ]

scripts/cpython-fetch.sh

@@ -3,7 +3,7 @@
 . ${CONFIG:-config}
 
 echo "
-    *cpython-fetch $PYBUILD*
+    *   cpython-fetch $PYBUILD  *
 "
 
 
@@ -31,7 +31,7 @@ then
         #cat $ROOT/support/compilenone.py > ./Lib/compileall.py
         popd
     else
-        git clone --depth 1 https://github.com/python/cpython.git cpython-git
+        git clone --no-tags --depth 1 --single-branch --branch main https://github.com/python/cpython.git cpython-git
         export REBUILD=true
     fi
 

scripts/emsdk-fetch.sh

@@ -81,6 +81,8 @@ then
             embuilder --pic build sdl2
             embuilder build sdl2
             rm -rf ${SDKDIR}/emsdk/upstream/emscripten/cache/ports/sdl2/SDL-*
+            rm -rf ${SDKDIR}/emsdk/upstream/emscripten/cache/ports
+            rm -rf ${SDKDIR}/emsdk/upstream/emscripten/cache/ports-builds
             rm -rf ${SDKDIR}/emsdk/upstream/emscripten/tests
         fi
 

support/__EMSCRIPTEN__.c

@@ -60,8 +60,8 @@ self hosting:
 
 #include <unistd.h>
 
-
-extern void PyGame_static_init();
+extern void Inittab_pygame();
+//extern PyMODINIT_FUNC PyInit_pygame_static(void);
 
 static long long embed = 0;
 
@@ -466,13 +466,8 @@ main(int argc, char **argv)
 #endif
 
     PyImport_AppendInittab("embed", init_embed);
-
-
-    PyGame_static_init();
-
-    //PyImport_AppendInittab("pymunk_static", PyInit__chipmunk);
-
-    //puts("pymain_init");
+    //PyImport_AppendInittab("pygame_static", PyInit_pygame_static);
+    Inittab_pygame();
 
     setenv("TERM","xterm", 1);
     setenv("TERMINFO", "/usr/share/terminfo", 1);