wasm prebuilt/cython install fixes

Author: pmp-p

python-wasm-sdk.sh

@@ -64,6 +64,7 @@ do
         ./scripts/emsdk-fetch.sh
 
         echo " ------------ building cpython wasm ${PYBUILD} ${CIVER} ----------------" 1>&2
+
         if ./scripts/cpython-build-emsdk.sh > /dev/null
         then
             echo " ---------- building cpython wasm plus ${PYBUILD} ${CIVER} -----------" 1>&2

scripts/cpython-build-emsdk-prebuilt.sh

@@ -7,13 +7,13 @@ CYTHON_WHL=${CYTHON:-Cython-${CYTHON_REL}-py2.py3-none-any.whl}
 
 $HPY -m pip install --upgrade pip
 
-pushd src
+pushd build
     wget -q -c https://github.com/cython/cython/releases/download/${CYTHON_REL}/${CYTHON_WHL}
     $HPY install --upgrade $CYTHON_WHL
-podp
+popd
 
 
-PIP="$(realpath python3-wasm) -m pip"
+PIP="${SDKROOT}/python3-wasm -m pip"
 
 echo "
     *   cpython-build-emsdk-prebuilt pip==$PIP   *
@@ -39,21 +39,14 @@ do
 done
 
 
-pushd src
-    $PIP install $CYTHON
-
-
-
-
-
-
-
-
+$PIP install build/$CYTHON_WHL
 
 
 
+pushd src
 
 
+# TODO
 
 
 

scripts/cpython-build-emsdk.sh

@@ -61,10 +61,8 @@ else
 #TODO: check if export PATH=${HOST_PREFIX}/bin:$PATH is really set to avoid system python with different bytecode
 #and no loder lib-dynload in the way.
 
-    export EMCC_CFLAGS="-O0 -g0 -fPIC"
-
-    CFLAGS="-O0 -g0 -fPIC" \
-     emconfigure $ROOT/src/libffi/configure --host=wasm32-tot-linux\
+    EMCC_CFLAGS="-O0 -g0 -fPIC" CFLAGS="-O0 -g0 -fPIC" CC=${SDKROOT}/emsdk/upstream/emscripten/emcc \
+     emconfigure $ROOT/src/libffi/configure --host=wasm32-mvp-emscripten\
       --prefix=$PREFIX --enable-static --disable-shared --disable-dependency-tracking\
       --disable-builddir --disable-multi-os-directory --disable-raw-api --disable-docs
 
@@ -281,6 +279,18 @@ IS_SHARED=false
 for arg do
     shift
 
+    if [ "\$arg" = "-v" ]
+    then
+        \$SYS_PYTHON -E \$0.py -v
+        exit 0
+    fi
+
+    if [ "\$arg" = "--version" ]
+    then
+        \$SYS_PYTHON -E \$0.py --version
+        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

scripts/emsdk-fetch.sh

@@ -102,6 +102,12 @@ for arg do
         exit 0
     fi
 
+    if [ "\$arg" = "--version" ]
+    then
+        \$EMSDK_PYTHON -E \$0.py --version
+        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