remove conflicting symlinks in bin folder

Author: pmp-p

scripts/cpython-build-emsdk-deps.sh

@@ -4,15 +4,22 @@
 
 . ./scripts/emsdk-fetch.sh
 
-# echo " ${PIMINOR}"|grep -q 11$
-if true
-then
-    HPFX=./devices/x86_64/usr/lib/python${PYBUILD}
-    rm ./devices/emsdk/usr/lib/python${PYBUILD}/ensurepip/_bundled/setuptools-*-py3-none-any.whl
-    cp -Rf $HPFX/setuptool* ./devices/emsdk/usr/lib/python${PYBUILD}/
-    cp -Rf $HPFX/_distutils* ./devices/emsdk/usr/lib/python${PYBUILD}/
-    cp -Rf $HPFX/pkg_resources ./devices/emsdk/usr/lib/python${PYBUILD}/
-fi
+HPFX=./devices/x86_64/usr/lib/python${PYBUILD}
+
+for moveit in setuptools distutils _distutils _distutils_hack pkg_resources
+do
+    if [ -d $HPFX/site-packages/${moveit} ]
+    then
+        echo "
+        * migrating ${moveit}
+"
+        cp -rf $HPFX/site-packages/${moveit}  $HPFX/
+        cp -rf $HPFX/site-packages/${moveit}-* $HPFX/
+    fi
+done
+
+
+
 
 # ../../devices/x86_64/usr/bin/python3-wasm -mpip install .
 # not working because python startup is skipped

scripts/cpython-build-emsdk.sh

@@ -28,6 +28,13 @@ then
     REBUILD=true
 fi
 
+# 3.10 is not wasm stable
+if [ -f support/__EMSCRIPTEN__.patches/${PYBUILD}.diff ]
+then
+    pushd src/cpython 2>&1 >/dev/null
+    patch -p1 < ../../support/__EMSCRIPTEN__.patches/${PYBUILD}.diff
+    popd 2>&1 >/dev/null
+fi
 
 
 if [ -f $EMSDK/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/pic/libffi.a ]

scripts/cpython-build-host-deps.sh

@@ -21,7 +21,6 @@ $PIP install setuptools --upgrade
 HPFX=./devices/x86_64/usr/lib/python${PYBUILD}
 rm -rf $HPFX/ensurepip/_bundled/*-py3-none-any.whl
 
-
 for moveit in setuptools _distutils _distutils_hack pkg_resources
 do
     if [ -d $HPFX/site-packages/${moveit} ]
@@ -41,7 +40,6 @@ then
 fi
 
 
-
 # https://github.com/aroberge/ideas, for code transformation
 $PIP install token-utils
 

scripts/cpython-fetch.sh

@@ -11,6 +11,8 @@ mkdir -p src
 pushd src 2>&1 >/dev/null
 
 NOPATCH=false
+PYPATCH=true
+
 [ -L cpython ] && rm cpython
 
 [ -f $HPY ] || REBUILD=true
@@ -56,10 +58,15 @@ if echo $PYBUILD | grep -q 10$
 then
     wget -q -c https://www.python.org/ftp/python/3.10.5/Python-3.10.5.tar.xz
     tar xf Python-3.10.5.tar.xz
-    ln -s Python-3.10.5 cpython
 
-    #tar xfj /data/git/python-wasm-sdk/src/Python-3.10.5-pydk.tar.bz2
-    #ln -s Python-3.10.5-pydk cpython
+    if [ -d Python-3.10.5-pydk ]
+    then
+        PYPATCH=false
+        ln -s Python-3.10.5 cpython
+    else
+        PYPATCH=true
+        ln -s Python-3.10.5 cpython
+    fi
 
     NOPATCH=true
     export REBUILD=true
@@ -72,10 +79,11 @@ popd
 if [ -f support/__EMSCRIPTEN__.patches/${PYBUILD}.diff ]
 then
     pushd src/cpython 2>&1 >/dev/null
-    patch -p1 < ../../support/__EMSCRIPTEN__.patches/${PYBUILD}.diff
+    patch -p1 < ../../support/__EMSCRIPTEN__.patches/${PYBUILD}-host.diff
     popd 2>&1 >/dev/null
 fi
 
+
 # the sys._emscripten_info is actually not compatible with shared build
 # just move its stuff to main
 

scripts/emsdk-fetch.sh

@@ -84,6 +84,12 @@ IS_SHARED=false
 for arg do
     shift
 
+    if [ "\$arg" = "-v" ]
+    then
+        \$EMSDK_PYTHON -E \$0.py -v
+        exit 0
+    fi
+
     # that is for some very bad setup.py behaviour regarding cross compiling. should not be needed ..
     [ "\$arg" = "-I/usr/include" ] && continue
     [ "\$arg" = "-I/usr/include/SDL2" ] && continue