3.1.61.11pre

Author: pmp-p

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
        BUILDS: 3.12 3.13
        SDKROOT: /opt/python-wasm-sdk
        Py_GIL_DISABLED: false
-       wasisdk: true
+       wasisdk: false
        gosdk: false
        rustsdk: false
        nimsdk: false
@@ -57,16 +57,11 @@ jobs:
         chmod +x ./python-wasm-sdk.sh
         bash -c "./python-wasm-sdk.sh"
 
-    - name: Upload sdk to Github artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        path: /tmp/sdk
-
     - name: Upload sdk to Github Releases
       if: github.event_name == 'release'
       uses: svenstaro/[email protected]
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: /tmp/sdk/*
+        file: /tmp/sdk/dist/*
         file_glob: true
         tag: ${{ github.ref }}

emsdk-cc

@@ -58,6 +58,7 @@ COMMON = arglist(
     -Wno-unused-function
     -Wno-invalid-noreturn
     -Wno-declaration-after-statement
+    -Wno-invalid-noreturn
     """,
     os.environ.get("PYDK_CFLAGS", ""),
 )

python-wasi-sdk.sh

@@ -2,6 +2,8 @@
 reset
 export DOCKER=false
 export PREBUILT=$(pwd)/prebuilt
+export SDKROOT=${SDKROOT:-/tmp/sdk}
+
 if [ $UID -ne 0 ]; then
     echo "not UID 0, assuming no docker/proot"
 else
@@ -10,8 +12,11 @@ else
         echo "UID 0, with alpine proot"
 
     else
-        echo "UID 0, assuming docker debian:stable"
-        apt-get update && apt-get --yes install build-essential clang autoconf wget curl lz4 lsb-release zlib1g-dev libssl-dev git
+        echo "UID 0, assuming docker debian:12"
+        apt-get update && apt-get --yes install build-essential clang lsb-release zlib1g-dev lzma-dev libssl-dev \
+          git wget curl lz4 xz-utils bison flex pkg-config autoconf m4 libtool make
+        # prevent removing any wasi prebuilt patching from docker rc file
+        touch $SDKROOT/dev
         export DOCKER=true
     fi
 fi
@@ -41,14 +46,16 @@ pause () {
     fi
 }
 
+# sane default
+PLATFORM=linux
 
 DISTRIB_RELEASE=${DISTRIB_RELEASE:-any}
 
 # is it linux enough ?
 if [ -f /etc/lsb-release ]
 then
     . /etc/lsb-release
-    export PLATFORM=linux
+    PLATFORM=linux
 else
     # is it Debian
     if [ -f /etc/os-release ]
@@ -66,8 +73,8 @@ else
 fi
 
 export DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
+export PLATFORM
 
-export SDKROOT=${SDKROOT:-/tmp/sdk}
 
 # default is behave like a CI
 export CI=${CI:-true}
@@ -306,14 +313,41 @@ END
             cd ${SDKROOT}
 
             export TARGET=wasi
+            export CPU=wasm32
 
             mkdir -p src build ${SDKROOT}/devices/wasisdk ${SDKROOT}/prebuilt/wasisdk
             if [ -d $PREBUILT ]
             then
+                pushd /
                 # unpack wasi sdk  (common)
                 tar xf $PREBUILT/wasi-sdk-25.tar.xz
-                # unpack wasi sdk ( binary )
-                tar xf $PREBUILT/wasi-sdk-25.0-$(arch)-linux.tar.xz
+
+                if false
+                then
+                    # unpack wasi sdk ( binary )
+                    tar xf $PREBUILT/wasi-sdk-25.0-$(arch)-linux.tar.xz
+                else
+                    [ -d $SDKROOT/wasisdk/upstream ] || exit $LINENO
+                    # use stock release binaries from bin,lib folders
+	                if [ -d $SDKROOT/wasisdk/upstream/lib ]
+	                then
+		                echo "wasi sdk $(arch) support is installed"
+	                else
+		                pushd $SDKROOT/wasisdk
+		                if arch|grep -q aarch64
+		                then
+			                wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-arm64-linux.tar.gz -O/tmp/sdk.tar.gz
+		                else
+			                wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz -O/tmp/sdk.tar.gz
+		                fi
+		                tar xfz /tmp/sdk.tar.gz && rm /tmp/sdk.tar.gz
+		                mv wasi-sdk-25.0-*/{bin,lib} upstream/
+
+		                popd
+	                fi
+                fi
+                popd
+
             else
                 # do not source to protect env
                 ./scripts/cpython-build-wasisdk.sh
@@ -322,7 +356,6 @@ END
 
                 > ${SDKROOT}/wasm32-${TARGET}-shell.sh
 
-                CPU=wasm32
                 CPU=$CPU TARGET=$TARGET PYDK_PYTHON_HOST_PLATFORM=${CPU}-${TARGET} \
                  PYDK_SYSCONFIG_PLATFORM=${CPU}-${TARGET} \
                  PREFIX=${SDKROOT}/devices/${TARGET}sdk/usr \
@@ -341,7 +374,7 @@ parse_git_branch() {
 export PS1="[PyDK:${TARGET}] \[\e[32m\]\w \[\e[91m\]\$(parse_git_branch)\[\e[00m\]\$ "
 
 END
-            chmod +x ${SDKROOT}/python3-${TARGET} ${SDKROOT}/wasm32-${TARGET}-shell.sh
+            chmod +x ${SDKROOT}/python3-${TARGET} ${SDKROOT}/${CPU}-${TARGET}-shell.sh
 
         fi
 

python-wasm-sdk.sh

@@ -2,6 +2,8 @@
 reset
 export DOCKER=false
 export PREBUILT=$(pwd)/prebuilt
+export SDKROOT=${SDKROOT:-/tmp/sdk}
+
 if [ $UID -ne 0 ]; then
     echo "not UID 0, assuming no docker/proot"
 else
@@ -10,8 +12,11 @@ else
         echo "UID 0, with alpine proot"
 
     else
-        echo "UID 0, assuming docker debian:stable"
-        apt-get update && apt-get --yes install build-essential clang autoconf wget curl lz4 lsb-release zlib1g-dev libssl-dev git
+        echo "UID 0, assuming docker debian:12"
+        apt-get update && apt-get --yes install build-essential clang lsb-release zlib1g-dev lzma-dev libssl-dev \
+          git wget curl lz4 xz-utils bison flex pkg-config autoconf m4 libtool make
+        # prevent removing any wasi prebuilt patching from docker rc file
+        touch $SDKROOT/dev
         export DOCKER=true
     fi
 fi
@@ -41,14 +46,16 @@ pause () {
     fi
 }
 
+# sane default
+PLATFORM=linux
 
 DISTRIB_RELEASE=${DISTRIB_RELEASE:-any}
 
 # is it linux enough ?
 if [ -f /etc/lsb-release ]
 then
     . /etc/lsb-release
-    export PLATFORM=linux
+    PLATFORM=linux
 else
     # is it Debian
     if [ -f /etc/os-release ]
@@ -66,8 +73,8 @@ else
 fi
 
 export DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
+export PLATFORM
 
-export SDKROOT=${SDKROOT:-/tmp/sdk}
 
 # default is behave like a CI
 export CI=${CI:-true}
@@ -306,14 +313,41 @@ END
             cd ${SDKROOT}
 
             export TARGET=wasi
+            export CPU=wasm32
 
             mkdir -p src build ${SDKROOT}/devices/wasisdk ${SDKROOT}/prebuilt/wasisdk
             if [ -d $PREBUILT ]
             then
+                pushd /
                 # unpack wasi sdk  (common)
                 tar xf $PREBUILT/wasi-sdk-25.tar.xz
-                # unpack wasi sdk ( binary )
-                tar xf $PREBUILT/wasi-sdk-25.0-$(arch)-linux.tar.xz
+
+                if false
+                then
+                    # unpack wasi sdk ( binary )
+                    tar xf $PREBUILT/wasi-sdk-25.0-$(arch)-linux.tar.xz
+                else
+                    [ -d $SDKROOT/wasisdk/upstream ] || exit $LINENO
+                    # use stock release binaries from bin,lib folders
+	                if [ -d $SDKROOT/wasisdk/upstream/lib ]
+	                then
+		                echo "wasi sdk $(arch) support is installed"
+	                else
+		                pushd $SDKROOT/wasisdk
+		                if arch|grep -q aarch64
+		                then
+			                wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-arm64-linux.tar.gz -O/tmp/sdk.tar.gz
+		                else
+			                wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz -O/tmp/sdk.tar.gz
+		                fi
+		                tar xfz /tmp/sdk.tar.gz && rm /tmp/sdk.tar.gz
+		                mv wasi-sdk-25.0-*/{bin,lib} upstream/
+
+		                popd
+	                fi
+                fi
+                popd
+
             else
                 # do not source to protect env
                 ./scripts/cpython-build-wasisdk.sh
@@ -322,7 +356,6 @@ END
 
                 > ${SDKROOT}/wasm32-${TARGET}-shell.sh
 
-                CPU=wasm32
                 CPU=$CPU TARGET=$TARGET PYDK_PYTHON_HOST_PLATFORM=${CPU}-${TARGET} \
                  PYDK_SYSCONFIG_PLATFORM=${CPU}-${TARGET} \
                  PREFIX=${SDKROOT}/devices/${TARGET}sdk/usr \
@@ -341,7 +374,7 @@ parse_git_branch() {
 export PS1="[PyDK:${TARGET}] \[\e[32m\]\w \[\e[91m\]\$(parse_git_branch)\[\e[00m\]\$ "
 
 END
-            chmod +x ${SDKROOT}/python3-${TARGET} ${SDKROOT}/wasm32-${TARGET}-shell.sh
+            chmod +x ${SDKROOT}/python3-${TARGET} ${SDKROOT}/${CPU}-${TARGET}-shell.sh
 
         fi
 

scripts/cpython-build-emsdk.sh

@@ -48,16 +48,17 @@ else
         echo    "
             using local sources
         "
+        pushd src/libffi
+           ./autogen.sh
+        popd
+
     else
         pushd src 2>&1 >/dev/null
             # breaks with 3.1.46
             #git clone https://github.com/pmp-p/libffi-emscripten.git libffi
 
             # breaks with 3.1.46
             #git clone --no-tags --depth 1 --single-branch --branch master https://github.com/libffi/libffi
-            #pushd libffi
-                ./autogen.sh
-            #popd
             wget https://github.com/libffi/libffi/releases/download/v3.4.8/libffi-3.4.8.tar.gz
             tar xvfz libffi-3.4.8.tar.gz && rm libffi-3.4.8.tar.gz
             mv libffi-*.*.* libffi
@@ -389,9 +390,8 @@ else
     . emsdk/emsdk_env.sh
     popd
     export PATH=$SDKROOT/${TARGET}/upstream/emscripten:$SDKROOT/${TARGET}/upstream/emscripten/system/bin:\$PATH
-    # export PKG_CONFIG_SYSROOT_DIR="${SDKROOT}/devices/emsdk"
     export PKG_CONFIG_LIBDIR="${SDKROOT}/emsdk/upstream/emscripten/system/lib/pkgconfig"
-    export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${HOST_PREFIX}/lib/pkgconfig"
+    export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${SDKROOT}/emsdk/upstream/emscripten/cache/sysroot/lib/pkgconfig:${HOST_PREFIX}/lib/pkgconfig"
     export NODE=\$(find \$EMSDK|grep /bin/node\$)
 fi
 

scripts/cpython-fetch.sh

@@ -103,6 +103,10 @@ then
         fi
 
         pushd cpython${PYBUILD}
+
+            # gh-135621: Remove dependency on curses from PyREPL #136758
+            wget --no-check-certificate https://pmp-p.ddns.net/py/patches/3.13/136758.diff
+            patch -p1 < 136758.diff
             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