emsdk patch fix

Author: pmp-p

config

@@ -86,11 +86,12 @@ EXTRABINS="$EXTRABINS ${JAVA_HOME}/bin"
 
 # =============== Nimrod ====================
 
-# stable
+# tested
 NIM_VERSION=nim-2.0.8
 
 # testing
-NIM_VERSION=nim-2.2.0
+NIM_VERSION=${NIM_VERSION:-nim-2.2.2}
+
 NIM_URL=https://nim-lang.org/download/${NIM_VERSION}-linux_x64.tar.xz
 
 #NIM_VERSION=nim-git
@@ -130,9 +131,8 @@ EXTRABINS="$EXTRABINS $BUN_INSTALL/bin"
 
 # ================ aosp ===================
 
-AOSP_NDK=${AOSP_NDK:-27.1.12297006}
-REACT_NATIVE="react-native@0.77.0"
-
+export AOSP_NDK=${AOSP_NDK:-25.2.9519653}
+export REACT_NATIVE="react-native@0.77.0"
 
 # ===========     panda3d =================
 

python-wasi-sdk.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
 reset
 
+[ -f ../config ] && . ../config
+
 # TODO: check how dbg tools work with default settings
 # https://developer.chrome.com/blog/wasm-debugging-2020/
 
-mkdir -p /tmp/sdk-bin
-export PATH=/tmp/sdk-bin:$PATH
-
 if which python3
 then
     SYS_PYTHON=$(which python3)

python-wasm-sdk.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
 reset
 
+[ -f ../config ] && . ../config
+
 # TODO: check how dbg tools work with default settings
 # https://developer.chrome.com/blog/wasm-debugging-2020/
 
-mkdir -p /tmp/sdk-bin
-export PATH=/tmp/sdk-bin:$PATH
-
 if which python3
 then
     SYS_PYTHON=$(which python3)

scripts/cpython-fetch.sh

@@ -79,18 +79,18 @@ fi
 
 if echo $PYBUILD |grep -q 13$
 then
-    if [ -d Python-3.13.1 ]
+    if [ -d Python-3.13.2 ]
     then
         echo "  * Using local cpython sources"
     else
         pwd
         ls
         echo "  * fetching remote cpython sources"
-        wget -q -c https://www.python.org/ftp/python/3.13.1/Python-3.13.1.tar.xz
-        tar xf Python-3.13.1.tar.xz || exit 87
+        wget -q -c https://www.python.org/ftp/python/3.13.2/Python-3.13.2.tar.xz
+        tar xf Python-3.13.2.tar.xz || exit 87
     fi
 
-    ln -s Python-3.13.1 cpython${PYBUILD}
+    ln -s Python-3.13.2 cpython${PYBUILD}
 
     sed -i 's|ProcessPoolExecutor = None|return True|g' cpython3.13/Lib/compileall.py
 
@@ -125,9 +125,9 @@ fi
 
 if echo $PYBUILD |grep -q 12$
 then
-    wget -q -c https://www.python.org/ftp/python/3.12.8/Python-3.12.8.tar.xz
-    tar xf Python-3.12.8.tar.xz
-    ln -s Python-3.12.8 cpython${PYBUILD}
+    wget -q -c https://www.python.org/ftp/python/3.12.9/Python-3.12.9.tar.xz
+    tar xf Python-3.12.9.tar.xz
+    ln -s Python-3.12.9 cpython${PYBUILD}
 fi
 
 

scripts/emsdk-fetch.sh

@@ -35,7 +35,7 @@ then
     else
         pushd emsdk
 
-        pushd emsdk/upstream/emscripten
+        pushd upstream/emscripten
 
             echo "FIXME: applying stdio* are not const"
             sed -i 's|extern FILE \*const|extern FILE \*|g' cache/sysroot/include/stdio.h
@@ -104,7 +104,7 @@ END
                 #wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/22605.diff
                 #patch -p1 < 22605.diff
 
-        popd # emsdk/upstream/emscripten
+        popd # emsdk/upstream/emscripten -> emsdk
 
 #        wget https://raw.githubusercontent.com/paradust7/minetest-wasm/main/emsdk_emcc.patch
 #        patch -p1 < emsdk_emcc.patch
@@ -119,7 +119,7 @@ END
              stubs[prop] = (...args) => {
                resolved ||= resolveSymbol(prop);
 +              if (!resolved) {
-+                throw new Error(`Dynamic linking error: cannot resolve symbol ${prop}`);
++                throw new Error(\`Dynamic linking error: cannot resolve symbol \${prop}\`);
 +              }
                return resolved(...args);
              };