3.1.50.1bi-pre

pygame-web · Nov 22, 2023 · 3815d1a · 3815d1a
1 parent e1d2c46
commit 3815d1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/scripts/cpython-build-emsdk.sh b/scripts/cpython-build-emsdk.sh
@@ -187,7 +187,10 @@ END
     pushd $ROOT/src/cpython${PYBUILD}
     # fix double linking
     sed -i 's|   -lcrypto||g' Makefile.pre.in
-    sed -i 's|#error|//#error|g' /opt/python-wasm-sdk/src/Python-3.11.6/Include/pyport.h
+
+# REALLY FIXME: appeared only after 3.1.49bi
+    sed -i 's|#error|//#error|g' $ROOT/src/cpython${PYBUILD}/Include/pyport.h
+
     # please let compiler/user decide what to do with wasm CPU.
     sed -i 's|-sWASM_BIGINT||g' configure
     sed -i 's|-sWASM_BIGINT||g' configure.ac

diff --git a/scripts/emsdk-fetch.sh b/scripts/emsdk-fetch.sh
@@ -190,8 +190,6 @@ MVP=\${MVP:true}
 WASM_PURE=\${WASM_PURE:true}
 
 
-
-
 if \$MVP
 then
 
@@ -208,14 +206,14 @@ then
     #WASMOPTS="-fno-wasm-exceptions -sSUPPORT_LONGJMP=emscripten"
     #CPU="-mnontrapping-fptoint -mno-reference-types -mno-sign-ext -m32"
 
-    CPU="-sSUPPORT_LONGJMP=emscripten -mnontrapping-fptoint -mno-reference-types -mno-sign-ext -m32"
+    CPU="-D_FILE_OFFSET_BITS=64 -sSUPPORT_LONGJMP=emscripten -mnontrapping-fptoint -mno-reference-types -mno-sign-ext -m32"
 
 else
-    CPU="-mcpu=bleeding-edge -m64"
+    CPU="-D_FILE_OFFSET_BITS=64 -mcpu=bleeding-edge -m64"
 fi
 
-# quick hack until 3.1.47
-WASMOPTS="$WASM_EXTRA \$WASMOPTS"
+# try to keep 32 but with 64 iface (bitint)
+WASMEXTRA="$WASM_EXTRA \$WASMOPTS"
 
 
 LINKING=\${LINKING:-false}
@@ -384,7 +382,7 @@ done
 if \$IS_SHARED
 then
     # always pass CPU opts when linking
-    $EMSDK_PYTHON -E \$0.py \$SHARED $COPTS \$CPU \$LDFLAGS -sSIDE_MODULE -gsource-map --source-map-base / "\$@" \$COMMON
+    $EMSDK_PYTHON -E \$0.py \$SHARED $COPTS \$CPU \$WASM_EXTRA \$LDFLAGS -sSIDE_MODULE -gsource-map --source-map-base / "\$@" \$COMMON
     if \$MVP
     then
         if \$WASM_PURE