3.1.72.1

pygame-web · Nov 22, 2024 · 42d6358 · 42d6358
1 parent 17c90c5
commit 42d6358
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/config b/config
@@ -67,6 +67,7 @@ export EMSDK_NUM_CORES=1
 
 # for shared modules
 export PYDK_PYTHON_HOST_PLATFORM=wasm32-${WASM_FLAVOUR}-emscripten
+export PYDK_SYSCONFIG_PLATFORM=$(echo -n $PYDK_PYTHON_HOST_PLATFORM|cut -d- -f1)-$(echo -n $PYDK_PYTHON_HOST_PLATFORM|cut -d- -f3)
 
 # ============== wasi sdk ===============
 

diff --git a/python-wasi-sdk.sh b/python-wasi-sdk.sh
@@ -175,7 +175,7 @@ END
             # wget https://github.com/bytecodealliance/wasmtime/releases/download/v26.0.1/wasmtime-v26.0.1-$(arch)-$(PLATFORM).tar.xz \
 # TODO: window only has a zip archive, better use wasmtime-py instead.
 
-            wget https://github.com/bytecodealliance/wasmtime/releases/download/v27.0.0/wasmtime-v27.0.0-$(arch)-$(PLATFORM).tar.xz \
+            wget https://github.com/bytecodealliance/wasmtime/releases/download/v27.0.0/wasmtime-v27.0.0-$(arch)-${PLATFORM}.tar.xz \
              -O-|xzcat|tar xfv -
             mv -vf $(find wasmtime*|grep /wasmtime$) ${SDKROOT}/devices/$(arch)/usr/bin
         fi
@@ -299,7 +299,7 @@ END
             > ${SDKROOT}/wasm32-${TARGET}-shell.sh
 
             CPU=wasm32 TARGET=$TARGET \
-             PYDK_PYTHON_HOST_PLATFORM=wasm32-${TARGET} \
+             PYDK_SYSCONFIG_PLATFORM=wasm32-${TARGET} \
              PREFIX=/opt/python-wasm-sdk/devices/wasisdk/usr \
              ./scripts/make-shells.sh
 

diff --git a/python-wasm-sdk.sh b/python-wasm-sdk.sh
@@ -175,7 +175,7 @@ END
             # wget https://github.com/bytecodealliance/wasmtime/releases/download/v26.0.1/wasmtime-v26.0.1-$(arch)-$(PLATFORM).tar.xz \
 # TODO: window only has a zip archive, better use wasmtime-py instead.
 
-            wget https://github.com/bytecodealliance/wasmtime/releases/download/v27.0.0/wasmtime-v27.0.0-$(arch)-$(PLATFORM).tar.xz \
+            wget https://github.com/bytecodealliance/wasmtime/releases/download/v27.0.0/wasmtime-v27.0.0-$(arch)-${PLATFORM}.tar.xz \
              -O-|xzcat|tar xfv -
             mv -vf $(find wasmtime*|grep /wasmtime$) ${SDKROOT}/devices/$(arch)/usr/bin
         fi
@@ -299,7 +299,7 @@ END
             > ${SDKROOT}/wasm32-${TARGET}-shell.sh
 
             CPU=wasm32 TARGET=$TARGET \
-             PYDK_PYTHON_HOST_PLATFORM=wasm32-${TARGET} \
+             PYDK_SYSCONFIG_PLATFORM=wasm32-${TARGET} \
              PREFIX=/opt/python-wasm-sdk/devices/wasisdk/usr \
              ./scripts/make-shells.sh
 

diff --git a/scripts/cpython-build-emsdk.sh b/scripts/cpython-build-emsdk.sh
@@ -348,6 +348,9 @@ include_dirs = $PREFIX/include
 NUMPY
 
 
+
+
+
 . scripts/make-shells.sh
 
 # C/C++/cmake shell
@@ -381,10 +384,11 @@ fi
 
 export SYS_PYTHON=${SYS_PYTHON}
 export EMSDK_PYTHON=${SYS_PYTHON}
-export _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__emscripten_
+export _PYTHON_SYSCONFIGDATA_NAME=\${_PYTHON_SYSCONFIGDATA_NAME:-_sysconfigdata__emscripten_debug}
 
 END
 
+
 # python shell
 cat > $HOST_PREFIX/bin/python3-wasm <<END
 #!/bin/bash

diff --git a/scripts/make-shells.sh b/scripts/make-shells.sh
@@ -10,6 +10,7 @@ export SDKROOT=${SDKROOT}
 
 export HOST_PREFIX=$HOST_PREFIX
 export PYDK_PYTHON_HOST_PLATFORM=${PYDK_PYTHON_HOST_PLATFORM}
+export PYDK_SYSCONFIG_PLATFORM=${PYDK_SYSCONFIG_PLATFORM}
 export PLATFORM_TRIPLET=${PYDK_PYTHON_HOST_PLATFORM}
 
 export PATH=${HOST_PREFIX}/bin:\$PATH:${SDKROOT}/devices/${TARGET}/usr/bin:$(echo -n ${SDKROOT}/emsdk/node/*/bin)