force pic in host static lib

Author: pmp-p

python-wasm-sdk.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 reset
+
+# TODO: check how dbg tools work with default settings
+# https://developer.chrome.com/blog/wasm-debugging-2020/
+
+
 . /etc/lsb-release
 DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
 
@@ -15,8 +20,11 @@ sudo chmod 777 ${SDKDIR}
 
 ORIGIN=$(pwd)
 
+# 3.12 3.11 3.10
+
+BUILDS=${BUILDS:-3.12 3.11 3.10}
 
-for PYBUILD in 3.12 3.11 3.10
+for PYBUILD in $BUILDS
 do
     cd "$ORIGIN"
 

scripts/cpython-build-emsdk-deps.sh

@@ -157,8 +157,8 @@ then
         popd
     fi
 
-    [ -f ../devices/emsdk/usr/lib/libncursesw.a ]
-    if true
+
+    if [ -f ../devices/emsdk/usr/lib/libncursesw.a ]
     then
         echo "
         * ncursesw already built

scripts/cpython-build-emsdk.sh

@@ -121,7 +121,7 @@ else
 
 #     --with-tzpath="/usr/share/zoneinfo" \
 
-    export EMCC_CFLAGS="$CPOPTS"
+    export EMCC_CFLAGS="$CPOPTS -I$PREFIX/include/ncursesw -sUSE_ZLIB -sUSE_BZIP2"
 
     CPPFLAGS="$CPPFLAGS -I$PREFIX/include/ncursesw"
     CFLAGS="$CPPFLAGS -I$PREFIX/include/ncursesw"
@@ -150,15 +150,13 @@ _decimal
 END
 
 
-    if EMCC_CFLAGS="-sUSE_ZLIB -sUSE_BZIP2" \
-        emmake make -j$NPROC WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/
+    if emmake make -j$NPROC WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/
     then
-        EMCC_CFLAGS="-sUSE_ZLIB -sUSE_BZIP2" \
         emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install
     else
         echo " **** cpython wasm build failed ***
 
-EMCC_CFLAGS="-sUSE_ZLIB -sUSE_BZIP2" emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install
+        emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install
 
         " 1>&2
 
@@ -180,7 +178,11 @@ EMCC_CFLAGS="-sUSE_ZLIB -sUSE_BZIP2" emmake make WASM_ASSETS_DIR=$(realpath ${PY
         # specific platform support
         cp -Rfv $ROOT/support/__EMSCRIPTEN__.patches/${PYBUILD}/. $HOST_PREFIX/lib/python${PYBUILD}/
 
-        cp -vf build/cpython-wasm/libpython3.*.a prebuilt/emsdk/
+        cp -vf build/cpython-wasm/libpython${PYBUILD}.a prebuilt/emsdk/
+        if [ -f build/cpython-wasm/Modules/expat/libexpat.a ]
+        then
+            cp build/cpython-wasm/Modules/expat/libexpat.a prebuilt/emsdk/libexpat${PYBUILD}.a
+        fi
         rmdir  $PREFIX/lib/python${PYBUILD}/lib-dynload
     fi
 fi
@@ -301,15 +303,19 @@ export PYTHONSTARTUP=$ROOT/support/__EMSCRIPTEN__.py
 # so include dirs are good
 export PYTHONHOME=$PREFIX
 
+# so pip does not think everything in ~/.local is useable
+export HOME=${PYTHONPYCACHEPREFIX}
+
+
 # find sysconfig ( tweaked )
 # but still can load dynload and setuptools
 PYTHONPATH=$(echo -n ${HOST_PREFIX}/lib/python/\${PYBUILD}/site-packages):\$PYTHONPATH
 export PYTHONPATH=$PYTHONPYCACHEPREFIX/sysconfig:$(echo -n ${HOST_PREFIX}/lib/python\${PYBUILD}/lib-dynload):\$PYTHONPATH
 
 
-#probably useless
+# just in case
 export _PYTHON_HOST_PLATFORM=${PYDK_PYTHON_HOST_PLATFORM}
-export PYTHON_FOR_BUILD=${PYTHON_FOR_BUILD}
+export PYTHON_FOR_BUILD=${HOST_PREFIX}/bin/python\${PYBUILD}
 
 ${HOST_PREFIX}/bin/python\${PYBUILD} -u -B \$@
 END

scripts/cpython-build-host-deps.sh

@@ -35,6 +35,12 @@ do
     fi
 done
 
+if [ -f $HPFX/site-packages/distutils-precedence.pth ]
+then
+    mv $HPFX/site-packages/distutils-precedence.pth $HPFX/
+fi
+
+
 
 # https://github.com/aroberge/ideas, for code transformation
 $PIP install token-utils

scripts/cpython-build-host.sh

@@ -56,14 +56,14 @@ END
 
 END
 
-
-
-    # Prevent freezing bytecode with a different magic
-    rm -f $HOST_PREFIX/bin/python3*
-
-    if command -v python3.${PYMINOR}
+    if echo $PYBUILD|grep -q 3.12$
     then
-        echo "
+        # Prevent freezing bytecode with a different magic
+        rm -f $HOST_PREFIX/bin/python3 $HOST_PREFIX/bin/python${PYBUILD}
+
+        if command -v python3.${PYMINOR}
+        then
+            echo "
 
     ===================================================================================
 
@@ -73,14 +73,16 @@ END
 
     ===================================================================================
 
-" 1>&2
-        sleep 6
+            " 1>&2
+            sleep 6
+        fi
     fi
 
+
 # OPT="$OPT"
 # CFLAGS="-DHAVE_FFI_PREP_CIF_VAR=1 -DHAVE_FFI_PREP_CLOSURE_LOC=1 -DHAVE_FFI_CLOSURE_ALLOC=1"
     if \
-    CC=clang CXX=clang++ \
+    CC=clang CXX=clang++ CFLAGS="-fPIC" CPPFLAGS="-fPIC" \
     ${ROOT}/src/cpython/configure \
      --prefix=$HOST_PREFIX $PYOPTS
     then