prepare 3.1.19

Author: pmp-p

scripts/cpython-build-emsdk-deps.sh

@@ -64,8 +64,14 @@ cd $ROOT/src
 TIFF_VER="4.3.0"
 WEBP_VER="1.2.2"
 
+# AVIF : OFF
+# JXL : OFF
+# TIF : OFF
+
 # ================== tiff ===================
 
+
+# OFF
 if false
 then
     if [ -f ../devices/emsdk/usr/lib/libtiff.a ]
@@ -89,8 +95,11 @@ if [ -f ../devices/emsdk/usr/lib/libwebp.a ]
 then
     echo "
     * libwep $WEBP_VER already built
-"
+"  1>&2
 else
+    echo "
+            * build libwebp
+"  1>&2
     wget -q -c https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$WEBP_VER.tar.gz \
         && tar xfz libwebp-$WEBP_VER.tar.gz
     pushd libwebp-$WEBP_VER
@@ -107,14 +116,14 @@ if [ -f ../devices/emsdk/usr/lib/libSDL2_image.a ]
 then
     echo "
     * SDL2_image already built
-"
+"  1>&2
 else
     #[ -d SDL_image ] || git clone https://github.com/libsdl-org/SDL_image
     if [ -d SDL2_image-2.6.1 ]
     then
         echo "
-            * build SDL2_image pre release
-        "  1>&2
+            * build SDL2_image from release
+"  1>&2
     else
         #bad png+grayscale https://github.com/libsdl-org/SDL_image/releases/download/candidate-2.5.1/SDL2_image-2.5.1.tar.gz
         wget -c -q https://github.com/libsdl-org/SDL_image/releases/download/release-2.6.1/SDL2_image-2.6.1.tar.gz

scripts/cpython-build-emsdk-prebuilt.sh

@@ -2,6 +2,17 @@
 
 . ${CONFIG:-config}
 
+CYTHON_REL=${CYTHON_REL:-3.0.0a11}
+CYTHON_WHL=${CYTHON:-Cython-${CYTHON_REL}-py2.py3-none-any.whl}
+
+$HPY -m pip install --upgrade pip
+
+pushd src
+    wget -q -c https://github.com/cython/cython/releases/download/${CYTHON_REL}/${CYTHON_WHL}
+    $HPY install --upgrade $CYTHON_WHL
+podp
+
+
 PIP="$(realpath python3-wasm) -m pip"
 
 echo "
@@ -11,6 +22,8 @@ echo "
 # make wheels
 # /opt/python-wasm-sdk/python3-wasm setup.py bdist_wheel
 
+$PIP install --upgrade pip
+
 for pkg in wheel installer
 do
     if [ -d prebuilt/emsdk/${PYBUILD}/site-packages/$pkg ]
@@ -27,11 +40,7 @@ done
 
 
 pushd src
-
-CYTHON=Cython-3.0.0a11-py2.py3-none-any.whl
-
-wget -q -c https://github.com/cython/cython/releases/download/3.0.0a11/${CYTHON}
-$PIP install $CYTHON
+    $PIP install $CYTHON
 
 
 

scripts/cpython-build-emsdk.sh

@@ -260,6 +260,8 @@ cp $PREFIX/lib/python${PYBUILD}/_sysconfigdata__emscripten_wasm32-emscripten.py
 sed -i 's|-Os|-O0|g' ${SDKROOT}/prebuilt/emsdk/${PYBUILD}/_sysconfigdata__emscripten_debug.py
 sed -i 's|-g0|-g3|g' ${SDKROOT}/prebuilt/emsdk/${PYBUILD}/_sysconfigdata__emscripten_debug.py
 
+#cp ${SDKROOT}/prebuilt/emsdk/${PYBUILD}/_sysconfigdata__emscripten_debug.py \
+# $PREFIX/lib/python${PYBUILD}/
 
 # python setup.py install --single-version-externally-managed --root=/
 # pip3 install .
@@ -394,7 +396,7 @@ export PYTHONHOME=$PREFIX
 # but still can load dynload and setuptools
 
 PYTHONPATH=${HOST_PREFIX}/lib/python\${PYBUILD}/site-packages:\$PYTHONPATH
-export PYTHONPATH=${SDKROOT}/prebuilt/emsdk/${PYBUILD}:${HOST_PREFIX}/lib/python\${PYBUILD}/lib-dynload:\$PYTHONPATH
+export PYTHONPATH=${SDKROOT}/prebuilt/emsdk/\${PYBUILD}:${HOST_PREFIX}/lib/python\${PYBUILD}/lib-dynload:\$PYTHONPATH
 
 # just in case
 export _PYTHON_HOST_PLATFORM=${PYDK_PYTHON_HOST_PLATFORM}

scripts/cpython-build-host.sh

@@ -33,7 +33,8 @@ then
     TESTSUITE="--enable-test-modules"
     #TESTSUITE=""
 else
-    TESTSUITE=""
+    TESTSUITE="--enable-test-modules"
+    #TESTSUITE=""
 fi
 
 echo "

scripts/emsdk-fetch.sh

@@ -66,8 +66,14 @@ then
             echo "
             + $done
     "  1>&2
+            embuilder build $one
             embuilder --pic build $one
+        done
+
+        for one in $ALL
+        do
             embuilder build $one
+            embuilder --pic build $one
         done
 
         cat > emsdk/upstream/emscripten/emcc <<END