3.1.61.12

Author: pmp-p

scripts/cpython-build-emsdk.sh

@@ -173,6 +173,9 @@ py_cv_module__ctypes=yes
 py_cv_module__ctypes_test=yes
 ax_cv_c_float_words_bigendian=no
 ac_cv_func_sem_clockwait=no
+
+ac_cv_file__dev_ptmx=no
+ac_cv_file__dev_ptc=no
 END
 
 
@@ -206,28 +209,35 @@ END
     sed -i 's|-sWASM_BIGINT||g' configure.ac
 
 
+    EXTRA_PYOPTS=""
+
     if [ ${PYMINOR} -ge 13 ]
     then
         sed -i 's|{ABIFLAGS}t|{ABIFLAGS}|g' configure
         sed -i 's|{ABIFLAGS}t|{ABIFLAGS}|g' configure.ac
         sed -i 's|--wasi preview2||g' configure
         sed -i 's|--wasi preview2||g' configure.ac
-        EXTRA="--without-pydebug --without-trace-refs --without-dsymutil --without-pymalloc --without-strict-overflow"
+        EXTRA_PYOPTS="--without-pydebug --without-trace-refs --without-dsymutil --without-pymalloc --without-strict-overflow"
     fi
 
     if [ ${PYMINOR} -ge 14 ]
     then
+
+        cp Tools/wasm/config.host-wasm32-emscripten Tools/wasm/config.site-wasm32-emscripten
+
         sed -i 's|wasm32-unknown-emscripten|wasm32-bi-emscripten|g' Makefile.pre.in
+        EXTRA_PYOPTS="$EXTRA_PYOPTS --disable-ipv6"
+    else
+        EXTRA_PYOPTS="$EXTRA_PYOPTS --with-emscripten-target=browser"
     fi
 
-
     popd
 
     chmod +x ${SDKROOT}/emsdk-cc
 
     export PYDK_CC=true
-    PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig" CONFIG_SITE=$ROOT/src/cpython${PYBUILD}/Tools/wasm/config.site-wasm32-pydk \
-     emconfigure $ROOT/src/cpython${PYBUILD}/configure -C --with-emscripten-target=browser $GIL \
+    PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig" CONFIG_SITE=$SDKROOT/src/cpython${PYBUILD}/Tools/wasm/config.site-wasm32-pydk \
+     emconfigure $ROOT/src/cpython${PYBUILD}/configure -C $GIL \
      --cache-file=${PYTHONPYCACHEPREFIX}/config.cache \
      --enable-wasm-dynamic-linking $TESTSUITE\
      --host=$PYDK_PYTHON_HOST_PLATFORM \

scripts/cpython-fetch.sh

@@ -44,10 +44,10 @@ fi
 
 if echo $PYBUILD |grep -q 14$
 then
+    wget -c https://www.python.org/ftp/python/3.14.0/Python-3.14.0rc1.tar.xz
+    tar xf Python-3.14.0rc1.tar.xz
+    ln -s Python-3.14.0rc1 cpython${PYBUILD}
 
-    wget -c https://www.python.org/ftp/python/3.14.0/Python-3.14.0b3.tar.xz
-    tar xf Python-3.14.0b3.tar.xz
-    ln -s Python-3.14.0b3 cpython${PYBUILD}
 
     mkdir $SDKROOT/devices/emsdk/usr/lib $SDKROOT/devices/$(arch)/usr/lib -p
 
@@ -58,6 +58,7 @@ then
     fi
 
     pushd cpython${PYBUILD}
+
         patch -p1 <<END
 --- Python-3.13.0rc3/Objects/moduleobject.c	2024-10-01 04:03:08.000000000 +0200
 +++ Python-3.13.0rc3.wasm/Objects/moduleobject.c	2024-10-02 13:16:33.030387509 +0200

scripts/emsdk-fetch.sh

@@ -36,18 +36,26 @@ then
             then
                 echo -n
             else
+
+                # including
+                # https://github.com/emscripten-forge/recipes/blob/main/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch
                 patch -p1 <<END
---- emsdk/upstream/emscripten/src/library_dylink.js
-+++ emsdk.fix/upstream/emscripten/src/library_dylink.js
-@@ -724,6 +724,8 @@
+--- emsdk/upstream/emscripten/src/library_dylink.js	2025-07-25 08:13:59.548799211 +0200
++++ emsdk.fix/upstream/emscripten/src/library_dylink.js	2025-07-25 08:11:56.611055127 +0200
+@@ -723,6 +723,13 @@
+             var resolved;
              stubs[prop] = (...args) => {
                resolved ||= resolveSymbol(prop);
-               if (!resolved) {
++              if (!resolved) {
 +                if (prop==='getTempRet0')
 +                    return __emscripten_tempret_get(...args);
-                 throw new Error(\`Dynamic linking error: cannot resolve symbol \${prop}\`);
-               }
++                if (prop==='setTempRet0')
++                    return __emscripten_tempret_set(...args);
++                throw new Error(`Dynamic linking error: cannot resolve symbol ${prop}`);
++              }
                return resolved(...args);
+             };
+           }
 END
             fi
 
@@ -118,22 +126,7 @@ END
 #        patch -p1 < emsdk_emcc.patch
 
 
-        # https://github.com/emscripten-forge/recipes/blob/main/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch
-        patch -p1 <<END
---- emsdk-orig/upstream/emscripten/src/library_dylink.js
-+++ emsdk/upstream/emscripten/src/library_dylink.js
-@@ -723,6 +723,9 @@
-             var resolved;
-             stubs[prop] = (...args) => {
-               resolved ||= resolveSymbol(prop);
-+              if (!resolved) {
-+                throw new Error(\`Dynamic linking error: cannot resolve symbol \${prop}\`);
-+              }
-               return resolved(...args);
-             };
-           }
 
-END
 
 
         # https://github.com/paradust7/minetest-wasm/blob/main/emsdk_dirperms.patch

sources.wasm/9300-ode.sh

@@ -17,13 +17,20 @@ then
 
     mkdir -p $ROOT/build/ode
 
-    pushd $ROOT/build/ode
-        emcmake cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_INSTALL_PREFIX=$PREFIX \
- -DODE_NO_THREADING_INTF=OFF -DODE_NO_BUILTIN_THREADING_IMPL=OFF \
- -DODE_WITH_DEMOS=OFF ${ROOT}/src/ODE-wasm
-    sed -i 's/#error/\/\/#warning/g' ode/src/config.h
-    emmake make install
-    popd
+    if [ -f ${PREFIX}/lib/libode.a ]
+    then
+    echo    "
+        * ODE already built
+    "
+    else
+        pushd $ROOT/build/ode
+            emcmake cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_INSTALL_PREFIX=$PREFIX \
+     -DODE_NO_THREADING_INTF=OFF -DODE_NO_BUILTIN_THREADING_IMPL=OFF \
+     -DODE_WITH_DEMOS=OFF ${ROOT}/src/ODE-wasm
+        sed -i 's/#error/\/\/#warning/g' ode/src/config.h
+        emmake make install
+        popd
+    fi
 
     popd
 fi