3.1.65.11pre base, no extra

python-wasi-sdk.sh

@@ -95,12 +95,16 @@ do
             # generic wasm patchwork
             . support/__EMSCRIPTEN__.sh
 
-            . scripts/cpython-build-host.sh 2>&1 >/dev/null
+            . scripts/cpython-build-host.sh 2>&1 >/tmp/python-wasm-sdk.log
 
-            . scripts/cpython-build-host-deps.sh >/dev/null
+            [ -f $HPY ] || exit 100
+
+            . scripts/cpython-build-host-deps.sh > /dev/null
 
         fi
 
+        [ -f $HPY ] || exit 106
+
         cat > /opt/python-wasm-sdk/devices/$(arch)/usr/bin/py <<END
 #!/bin/bash
 export XDG_SESSION_TYPE=x11

python-wasm-sdk.sh

@@ -95,12 +95,16 @@ do
             # generic wasm patchwork
             . support/__EMSCRIPTEN__.sh
 
-            . scripts/cpython-build-host.sh 2>&1 >/dev/null
+            . scripts/cpython-build-host.sh 2>&1 >/tmp/python-wasm-sdk.log
 
-            . scripts/cpython-build-host-deps.sh >/dev/null
+            [ -f $HPY ] || exit 100
+
+            . scripts/cpython-build-host-deps.sh > /dev/null
 
         fi
 
+        [ -f $HPY ] || exit 106
+
         cat > /opt/python-wasm-sdk/devices/$(arch)/usr/bin/py <<END
 #!/bin/bash
 export XDG_SESSION_TYPE=x11

scripts/cpython-build-emsdk-deps.sh

@@ -30,24 +30,50 @@ Failed to build extra $pkg
     fi
 done
 
-# those depend on nanoX/microwindows compiled above
-if [ -d $ROOT/sources.wasm/x11 ]
+if ${EXTRA:-false}
 then
-    for pkg in $ROOT/sources.wasm/x11/*.sh
+    for pkg in $ROOT/sources.extra/*.sh
     do
         cd $ROOT
         chmod +x $pkg
         echo "
 
-        Third party (X11) : $pkg
+        Third party : $pkg
 
 
     "
-        $pkg
+        if $pkg
+        then
+            echo "$pkg : done"
+        else
+            echo "
+
+    Failed to build extra $pkg
+
+    "
+            exit 54
+        fi
     done
-fi
 
 
+    # those depend on nanoX/microwindows compiled above
+    if [ -d $ROOT/sources.extra/x11 ]
+    then
+        for pkg in $ROOT/sources.extra/x11/*.sh
+        do
+            cd $ROOT
+            chmod +x $pkg
+            echo "
+
+            Third party (X11) : $pkg
+
+
+        "
+            $pkg
+        done
+    fi
+fi
+
 cd $ROOT
 
 . ./scripts/emsdk-fetch.sh

sources.wasm/3000-libxml2-libicu.sh

@@ -21,7 +21,7 @@ then
         already built in $PREFIX/lib/
     "
 else
-
+    mkdir -p $PREFIX/lib/icu
     mkdir -p $ROOT/build/libicu
 
     pushd $ROOT/build/libicu

sources.wasm/9000-uuid-ossp.sh

@@ -37,11 +37,16 @@ END
             cp uuid.pc ../../src/uuid-1.6.2/
             echo "------ installing uuid ---------"
             emmake make install
-            mkdir -p $EMSDK/upstream/emscripten/cache/sysroot/include/ossp
-            mv $PREFIX/include/uuid.h $EMSDK/upstream/emscripten/cache/sysroot/include/ossp/
-            cp -r $EMSDK/upstream/emscripten/cache/sysroot/include/ossp $PREFIX/include/
+            INCDIR=$EMSDK/upstream/emscripten/cache/sysroot/include
+            LIBDIR=$EMSDK/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten
+            mkdir -p ${INCDIR}/ossp
+            mv $PREFIX/include/uuid.h ${INCDIR}/ossp/
+
+            cp -r ${INCDIR}/ossp $PREFIX/include/
             mv $PREFIX/lib/libuuid.a $PREFIX/lib/libossp-uuid.a
-            cp $PREFIX/lib/libossp-uuid.a $EMSDK/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/pic
+            # FIXME: non pic version is not built
+            cp $PREFIX/lib/libossp-uuid.a $LIBDIR
+            cp $PREFIX/lib/libossp-uuid.a $LIBDIR/pic
             rm $PREFIX/lib/libuuid.la
         else
             echo "