3.1.46test

Author: pmp-p

config

@@ -43,7 +43,7 @@ fi
 
 #stable
 # embind broke after 3.1.34
-# export EMFLAVOUR=${EMFLAVOUR:-3.1.34}
+# export EMFLAVOUR=3.1.34
 # export EMFLAVOUR=${EMFLAVOUR:latest}
 
 

scripts/cpython-build-emsdk-prebuilt.sh

@@ -5,7 +5,13 @@
 CYTHON_REL=${CYTHON_REL:-3.0.0}
 CYTHON_WHL=${CYTHON:-Cython-${CYTHON_REL}-py2.py3-none-any.whl}
 
-$HPY -m pip install --upgrade pip
+PACKAGING="pip build wheel pyparsing packaging installer"
+
+
+$HPY -m pip install --upgrade $PACKAGING
+
+# only for the simulator
+$HPY -m pip install --upgrade aioconsole
 
 pushd build
     wget -q -c https://github.com/cython/cython/releases/download/${CYTHON_REL}/${CYTHON_WHL}
@@ -20,28 +26,22 @@ echo "
 " 1>&2
 
 
-$PIP install --upgrade pip
-
-$PIP install --upgrade build
+# support package build/install
+$HPY -m pip install --upgrade $PACKAGING
+$PIP install --upgrade $PACKAGING
 
 # make wheels
 # /opt/python-wasm-sdk/python3-wasm setup.py bdist_wheel
 
-$PIP install wheel
-
 
 # cython
 $HPY -m pip install build/$CYTHON_WHL
 $PIP install build/$CYTHON_WHL
 
 
-# install them
-$PIP install installer
-
-
-# some we want in all minimal rootfs
+# some we want to be certain to have in all minimal rootfs
 mkdir -p prebuilt/emsdk/common/site-packages/
-for pkg in installer
+for pkg in pyparsing packaging installer
 do
     if [ -d prebuilt/emsdk/${PYBUILD}/site-packages/$pkg ]
     then
@@ -51,7 +51,8 @@ do
     else
         $PIP install $pkg
         cp -rf $PREFIX/lib/python${PYBUILD}/site-packages/${pkg} prebuilt/emsdk/common/site-packages/
-        cp -rf $PREFIX/lib/python${PYBUILD}/site-packages/${pkg}-* prebuilt/emsdk/common/site-packages/
+        # skip the distinfo to save space
+        #cp -rf $PREFIX/lib/python${PYBUILD}/site-packages/${pkg}-* prebuilt/emsdk/common/site-packages/
     fi
 done
 

scripts/cpython-build-emsdk.sh

@@ -96,11 +96,11 @@ echo "
 fi
 
 # in this special case build testsuite
-# main repo https://github.com/pmp-p/python-wasm-plus
+# main repo https://github.com/pmp-p/python-wasm-test
 
 # pygame-web won't build test modules
 
-if echo $GITHUB_WORKSPACE|grep -q /python-wasm-plus/
+if echo $GITHUB_WORKSPACE|grep -q /python-wasm-test/
 then
     TESTSUITE="--enable-test-modules"
     #TESTSUITE=""
@@ -166,6 +166,13 @@ END
 #     --with-libs='-lz -lffi' \
 
 
+    # MODULE__HASHLIB_LDFLAGS=-L/usr/lib   -lcrypto
+    pushd $ROOT/src/cpython${PYBUILD}
+    sed -i 's|   -lcrypto||g' Makefile.pre.in
+    sed -i 's|-sWASM_BIGINT||g' configure
+    sed -i 's|-sWASM_BIGINT||g' configure.ac
+    popd
+
     PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig" CONFIG_SITE=$ROOT/src/cpython${PYBUILD}/Tools/wasm/config.site-wasm32-pydk \
     emconfigure $ROOT/src/cpython${PYBUILD}/configure -C --with-emscripten-target=browser \
      --cache-file=${PYTHONPYCACHEPREFIX}/config.cache \
@@ -206,8 +213,6 @@ _crypt
 END
     fi
 
-    sed -i 's|   -lcrypto||g' Makefile
-
     if emmake make -j$NPROC WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/
     then
         if emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install
@@ -217,18 +222,21 @@ END
             exit 1
         fi
     else
+        sed -i 's|   -lcrypto||g' Makefile
         emmake make -j1 Modules/_ctypes/_ctypes.o
         if emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install
         then
             echo ok
         else
-            echo " **** cpython wasm build failed ***
+            echo "
 
-        emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/
+     **** cpython wasm build failed ***
+
+    emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install
 
         " 1>&2
 
-            exit 1
+            exit 2
         fi
     fi
 
@@ -375,7 +383,7 @@ chmod +x $HOST_PREFIX/bin/python3-wasm
 cp -f $HOST_PREFIX/bin/python3-wasm ${SDKROOT}/
 
 # TODO: FIXME:
-echo "366: cannot use python3-wasm as python3 for setup.py in pygame build" 1>&2
+echo "386: cannot use python3-wasm as python3 for setup.py in pygame build" 1>&2
 ln -sf $HOST_PREFIX/bin/python${PYBUILD} $HOST_PREFIX/bin/python3
 
 HPFX=./devices/$(arch)/usr/lib/python${PYBUILD}

scripts/emsdk-fetch.sh

@@ -24,10 +24,18 @@ then
                 pushd upstream/emscripten
                     echo "FIXME: Applying https://github.com/emscripten-core/emscripten/pull/17956"
                     wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/17956.diff
-                    patch -p1 < 17956.diff
-                    #echo "FIXME: Applying https://github.com/emscripten-core/emscripten/pull/18941"
-                    #wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/18941.diff
-                    #patch -p1 < 18941.diff
+                    if patch -p1 < 17956.diff
+                    then
+                        echo applied https://github.com/emscripten-core/emscripten/pull/17956
+                        # 18941 has been merged
+                    else
+                        # deal with old version of emsdk for the above 3.1.45 patch
+                        sed -i 's|new Uint8Array(data.object.contents), true, true|FS.readFile(_file), true, true|g' src/library_browser.js
+                        # merged since 3.1.34 which quite the more stable atm
+                        #echo "MAYBE FIXME: Applying https://github.com/emscripten-core/emscripten/pull/18941"
+                        #wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/18941.diff
+                        #patch -p1 < 18941.diff
+                    fi
                 popd
 
 #                wget https://raw.githubusercontent.com/paradust7/minetest-wasm/main/emsdk_emcc.patch
@@ -170,7 +178,7 @@ if \$MVP
 then
     # -mcpu=generic would activate those https://reviews.llvm.org/D125728
     # https://github.com/emscripten-core/emscripten/pull/17689
-    CPU="-mno-sign-ext -mno-mutable-globals -m32"
+    CPU="-sWASM_BIGINT=0 -sMIN_SAFARI_VERSION=120000 -mnontrapping-fptoint -mno-reference-types -mno-sign-ext -mno-mutable-globals -m32"
 else
     CPU="-mcpu=bleeding-edge -m32"
 fi
@@ -322,7 +330,7 @@ then
         rm \$SOTMP
     fi
 else
-    $EMSDK_PYTHON -E \$0.py $CPU \$COPTS \$CPPFLAGS -DBUILD_STATIC "\$@" \$COMMON
+    $EMSDK_PYTHON -E \$0.py $CPU -fpic \$COPTS \$CPPFLAGS -DBUILD_STATIC "\$@" \$COMMON
 fi
 #else
 #  unset _EMCC_CCACHE