try to fix mvp normalization on python built modules

Author: pmp-p

python-wasm-sdk.sh

@@ -84,16 +84,13 @@ do
                 ==========================================================
         " 1>&2
                     rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports*
-                    # something triggers sdl2 *full* rebuild in pygame.
-                    # but only that one.
-                    # embuilder --pic build sdl2
-                    # embuilder build sdl2
                     rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports/sdl2/SDL-*
                     rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports
                     rm -rf ${SDKROOT}/emsdk/upstream/emscripten/cache/ports-builds
                     rm -rf ${SDKROOT}/emsdk/upstream/emscripten/tests
 
 
+
                 echo "making tarball" 1>&2
 
                 cd /

scripts/cpython-build-emsdk-prebuilt.sh

@@ -33,7 +33,9 @@ $PIP install build/$CYTHON_WHL
 # install them
 $PIP install installer
 
-# some we want in rootfs
+
+# some we want in all minimal rootfs
+mkdir -p prebuilt/emsdk/common/site-packages/
 for pkg in installer
 do
     if [ -d prebuilt/emsdk/${PYBUILD}/site-packages/$pkg ]
@@ -43,8 +45,8 @@ do
             "
     else
         $PIP install $pkg
-        cp -rf $PREFIX/lib/python${PYBUILD}/site-packages/${pkg} prebuilt/emsdk/${PYBUILD}/site-packages/
-        cp -rf $PREFIX/lib/python${PYBUILD}/site-packages/${pkg}-* prebuilt/emsdk/${PYBUILD}/site-packages/
+        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/
     fi
 done
 

scripts/cpython-build-emsdk.sh

@@ -264,66 +264,7 @@ sed -i 's|-g0|-g3|g' ${SDKROOT}/prebuilt/emsdk/${PYBUILD}/_sysconfigdata__emscri
 # python setup.py install --single-version-externally-managed --root=/
 # pip3 install .
 
-cat > $HOST_PREFIX/bin/cc <<END
-#!/bin/bash
-if [ -z "\$_EMCC_CCACHE" ]
-then
-unset _PYTHON_SYSCONFIGDATA_NAME
-unset PYTHONHOME
-unset PYTHONPATH
-
-COMMON="-Wno-unused-command-line-argument -Wno-unreachable-code-fallthrough"
-SHARED=""
-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
-    [ "\$arg" = "-L/usr/lib64" ]	&& continue
-    [ "\$arg" = "-L/usr/lib" ]   && continue
-
-    if [ "\$arg" = "-shared" ]
-    then
-        IS_SHARED=true
-        SHARED="$SHARED -sSIDE_MODULE"
-    fi
-
-    if echo "\$arg"|grep -q wasm32-emscripten.so\$
-    then
-        IS_SHARED=true
-        SHARED="$SHARED -shared -sSIDE_MODULE"
-    fi
-    set -- "\$@" "\$arg"
-done
-
-if \$IS_SHARED
-then
-    $SYS_PYTHON -E $EMSDK/upstream/emscripten/emcc.py \
-     \$SHARED $COPTS $LDFLAGS -sSIDE_MODULE -gsource-map --source-map-base / "\$@" \$COMMON
-else
-    $SYS_PYTHON -E $EMSDK/upstream/emscripten/emcc.py \
-     $COPTS $CPPFLAGS -DBUILD_STATIC "\$@" \$COMMON
-fi
-else
-    unset _EMCC_CCACHE
-    exec ccache "\$0" "\$@"
-fi
-END
+ln -sf ${SDKROOT}/emsdk/upstream/emscripten/emcc $HOST_PREFIX/bin/cc
 
 chmod +x $HOST_PREFIX/bin/cc
 

scripts/emsdk-fetch.sh

@@ -89,7 +89,7 @@ unset PYTHONPATH
 # -Wwarn-absolute-paths
 # --valid-abspath ${SDKROOT}
 
-COMMON="-Wno-limited-postlink-optimizations"
+COMMON="-Wno-unused-command-line-argument -Wno-unreachable-code-fallthrough -Wno-limited-postlink-optimizations"
 SHARED=""
 IS_SHARED=false
 
@@ -120,12 +120,13 @@ for arg do
         SHARED="\$SHARED -sSIDE_MODULE"
     fi
 
-    if \$IS_SHARED
+    if echo "\$arg"|grep -q wasm32-emscripten.so\$
     then
-        true
-    else
-        if echo "\$arg"|grep -q wasm32-emscripten.so\$
+        SHARED_TARGET=\$arg
+        if \$IS_SHARED
         then
+            true
+        else
             IS_SHARED=true
             SHARED="\$SHARED -shared -sSIDE_MODULE"
         fi
@@ -136,9 +137,13 @@ done
 
 if \$IS_SHARED
 then
-    $EMSDK_PYTHON -E \$0.py \$SHARED $LDFLAGS "\$@" \$COMMON
+    $EMSDK_PYTHON -E \$0.py \$SHARED $COPTS $LDFLAGS -sSIDE_MODULE -gsource-map --source-map-base / "\$@" \$COMMON
+    SOTMP=\$(mktemp).so
+    mv \$SHARED_TARGET \$SOTMP
+    $SDKROOT/emsdk/upstream/bin/wasm-emscripten-finalize -mvp \$SOTMP -o \$SHARED_TARGET
+    rm \$SOTMP
 else
-    $EMSDK_PYTHON -E \$0.py \$CPPFLAGS "\$@" \$COMMON
+    $EMSDK_PYTHON -E \$0.py \$COPTS \$CPPFLAGS -DBUILD_STATIC "\$@" \$COMMON
 fi
 else
   unset _EMCC_CCACHE