3.1.61.7pre

Author: pmp-p

config

@@ -5,12 +5,12 @@ export CONFIG_ENV=true
 export LC_ALL=C
 export ROOT=${ROOT:-$(pwd)}
 export SDKROOT=${SDKROOT:-$ROOT}
-
+[ -f $SDKROOT/versions ] && source $SDKROOT/versions
 export PYTHONDONTWRITEBYTECODE=1
 export REBUILD=${REBUILD:-false}
 export CI=${CI:-false}
 
-export PYBUILD=${PYBUILD:-3.12}
+# PYBUILD comes from versions at runtime. must be specified at build.
 export PYMAJOR=$(echo -n $PYBUILD|cut -d. -f1)
 export PYMINOR=$(echo -n $PYBUILD|cut -d. -f2)
 
@@ -55,6 +55,7 @@ EXTRABINS="/usr/local/bin /opt/bin"
 
 # ============ emscripten ==============
 # stable==latest dev==tot
+# EMFLAVOUR comes from versions at runtime.
 export EMFLAVOUR=${EMFLAVOUR:latest}
 export EMSDK_QUIET=1
 export EMSDK_NOTTY=0

emsdk-cc

@@ -157,6 +157,7 @@ RUSTC = False
 NINJA = env("NINJA", false)
 
 out = []
+out_pos = 0
 
 # special partial linking mode
 if "-r" in sys.argv:

python-wasi-sdk.sh

@@ -79,6 +79,8 @@ for PYBUILD in $BUILDS
 do
     cd "$ORIGIN"
 
+    export PYBUILD
+
 
     if [ -f ${SDKROOT}/dev ]
     then

python-wasm-sdk.sh

@@ -79,6 +79,8 @@ for PYBUILD in $BUILDS
 do
     cd "$ORIGIN"
 
+    export PYBUILD
+
 
     if [ -f ${SDKROOT}/dev ]
     then

scripts/cpython-fetch.sh

@@ -79,18 +79,18 @@ fi
 
 if echo $PYBUILD |grep -q 13$
 then
-    if [ -d Python-3.13.2 ]
+    if [ -d Python-3.13.3 ]
     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.2/Python-3.13.2.tar.xz
-        tar xf Python-3.13.2.tar.xz || exit 87
+        wget -q -c https://www.python.org/ftp/python/3.13.3/Python-3.13.3.tar.xz
+        tar xf Python-3.13.3.tar.xz || exit 87
     fi
 
-    ln -s Python-3.13.2 cpython${PYBUILD}
+    ln -s Python-3.13.3 cpython${PYBUILD}
 
     sed -i 's|ProcessPoolExecutor = None|return True|g' cpython3.13/Lib/compileall.py
 
@@ -125,17 +125,17 @@ fi
 
 if echo $PYBUILD |grep -q 12$
 then
-    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}
+    wget -q -c https://www.python.org/ftp/python/3.12.10/Python-3.12.10.tar.xz
+    tar xf Python-3.12.10.tar.xz
+    ln -s Python-3.12.10 cpython${PYBUILD}
 fi
 
 
 if echo $PYBUILD | grep -q 11$
 then
-    wget -q -c https://www.python.org/ftp/python/3.11.11/Python-3.11.11.tar.xz
-    tar xf Python-3.11.11.tar.xz
-    ln -s Python-3.11.11 cpython${PYBUILD}
+    wget -q -c https://www.python.org/ftp/python/3.11.12/Python-3.11.12.tar.xz
+    tar xf Python-3.11.12.tar.xz
+    ln -s Python-3.11.12 cpython${PYBUILD}
 fi
 
 popd

sources.plus/w2c2.sh

@@ -6,7 +6,7 @@
 
 mkdir -p src native build/libdwarf  build/zstd
 
-DPIC="-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
+DPIC="-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
 
 pushd src
     [ -d libdwarf-code ] || git clone --recursive --no-tags --depth 1 --single-branch --branch main https://github.com/davea42/libdwarf-code

sources.wasm/9000-uuid-ossp.sh

@@ -62,7 +62,7 @@ END
             cp -vf /data/git/python-wasm-sdk/libtool ./
             chmod u-w+x /tmp/libtool /tmp/shtool libtool
 
-            if PATH=/tmp:$PATH CONFIG_SIZE=$(pwd)/config.site emconfigure ../../src/libuuid/configure --with-gnu-ld $mode --disable-shared --prefix=$PREFIX
+            if PATH=/tmp:$PATH CONFIG_SITE=$(pwd)/config.site emconfigure ../../src/libuuid/configure --with-gnu-ld $mode --disable-shared --prefix=$PREFIX
             then
                 cp -vf /data/git/python-wasm-sdk/{libtool,shtool} /tmp/
                 cp -vf /data/git/python-wasm-sdk/libtool ./

sources.wasm/9999-version.sh renamed to sources.wasm/9999-versions.sh

@@ -42,7 +42,8 @@ int main(int argc, char**arv){
 END
 
     emcc -sASSERTIONS=0 -sENVIRONMENT=node,web -o hello_em.html hello_em.c
-    $SDKROOT/emsdk/node/*.*.*64bit/bin/node hello_em.js >> $SDKROOT/config
+    echo "export PYBUILD=\${PYBUILD:-$PYBUILD}" > $SDKROOT/versions
+    $SDKROOT/emsdk/node/*.*.*64bit/bin/node hello_em.js >> $SDKROOT/versions
     rm hello_em.js hello_em.wasm hello_em.c
 popd
 

wasisdk/bin/wasi

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # https://stackoverflow.com/questions/20530105/how-to-specify-a-custom-stdlib-directory-for-llvm
 # https://stackoverflow.com/questions/60712261/how-to-prevent-osx-gcc-to-always-search-usr-local-include

wasisdk/wasisdk_env.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-SDKROOT=${SDKROOT:-/opt/python-wasm-sdk}
-
 if [[ -z ${WASISDK_ENV+z} ]]
 then
-    export WASISDK_ENV=true
+    SDKROOT=${SDKROOT:-/tmp/sdk}
     . ${CONFIG:-${SDKROOT}/config}
 
+    export WASISDK_ENV=true
+
     export WASI=true
     export ARCH=wasisdk
     export WASISDK=${WASISDK:-"${SDKROOT}/${ARCH}"}