absolute path in tarball, more fixes

Author: pmp-p

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update --fix-missing
-        # git clang libffi-dev libssl-dev zlib1g-dev libncursesw5-dev make
+        # git clang libffi-dev libssl-dev zlib1g-dev libncursesw5-dev python3-pip make
         sudo apt-get install -y bash wget
 
     - name: Build sdk

config

@@ -63,7 +63,7 @@ then
     echo -n
 else
     mkdir -p src
-    export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+    export PKG_CONFIG_PATH="${HOST_PREFIX}/lib/pkgconfig"
     export PATH="${HOST_PREFIX}/bin:$PATH"
     export PYDK=minimal
 fi

python-wasm-sdk.sh

@@ -20,8 +20,10 @@ then
 
     . scripts/cpython-fetch.sh
     . support/__EMSCRIPTEN__.sh
-    . scripts/cpython-build-host.sh >/dev/null
-    . scripts/cpython-build-host-deps.sh >/dev/null
+    . scripts/cpython-build-host.sh
+# >/dev/null
+    . scripts/cpython-build-host-deps.sh
+# >/dev/null
 
     # use ./ or emsdk will pollute env
     ./scripts/emsdk-fetch.sh
@@ -36,14 +38,15 @@ then
             cd /
             rm -rf ${SDKDIR}/emsdk/upstream/emscripten/cache/ports*
             mkdir -p /tmp/sdk
-            tar -cpRj \
-                .${SDKDIR}/config \
-                .${SDKDIR}/build/pycache/sysconfig/_sysconfigdata__emscripten_debug.py \
-                .${SDKDIR}/python3-wasm \
-                .${SDKDIR}/wasm32-*-shell.sh \
-                .${SDKDIR}/emsdk \
-                .${SDKDIR}/devices/* \
-                .${SDKDIR}/prebuilt/* \
+            tar -cpPRj \
+                ${SDKDIR}/config \
+                ${SDKDIR}/build/pycache/.??* \
+                ${SDKDIR}/build/pycache/sysconfig/_sysconfigdata__emscripten_debug.py \
+                ${SDKDIR}/python3-wasm \
+                ${SDKDIR}/wasm32-*-shell.sh \
+                ${SDKDIR}/emsdk \
+                ${SDKDIR}/devices/* \
+                ${SDKDIR}/prebuilt/* \
                 > /tmp/sdk/python-wasm-sdk-stable.tar.bz2
         else
             echo " cpython-build-emsdk-deps failed"

scripts/cpython-build-emsdk-deps.sh

@@ -4,6 +4,14 @@
 
 . ./scripts/emsdk-fetch.sh
 
+
+HPFX=./devices/x86_64/usr/lib/python3.11
+rm ./devices/emsdk/usr/lib/python3.11/ensurepip/_bundled/setuptools-*-py3-none-any.whl
+cp -Rf $HPFX/setuptool* ./devices/emsdk/usr/lib/python3.11/
+cp -Rf $HPFX/_distutils* ./devices/emsdk/usr/lib/python3.11/
+cp -Rf $HPFX/pkg_resources ./devices/emsdk/usr/lib/python3.11/
+
+
 # ../../devices/x86_64/usr/bin/python3-wasm -mpip install .
 # not working because python startup is skipped
 

scripts/cpython-build-emsdk.sh

@@ -121,7 +121,7 @@ else
 
 # CFLAGS="-DHAVE_FFI_PREP_CIF_VAR=1 -DHAVE_FFI_PREP_CLOSURE_LOC=1 -DHAVE_FFI_CLOSURE_ALLOC=1"
 
-    CONFIG_SITE=$ROOT/src/cpython/Tools/wasm/config.site-wasm32-emscripten\
+    CONFIG_SITE=$ROOT/src/cpython/Tools/wasm/config.site-wasm32-emscripten \
     OPT="$CPOPTS -DNDEBUG -fwrapv" \
     eval emconfigure $ROOT/src/cpython/configure -C --without-pymalloc --disable-ipv6 \
      --cache-file=${PYTHONPYCACHEPREFIX}/config.cache \
@@ -191,6 +191,15 @@ do
     fi
 done
 
+for arg do
+    shift
+    [ "\$arg" = "-I/usr/include" ] && continue
+    [ "\$arg" = "-I/usr/include/SDL2" ] && continue
+    [ "\$arg" = "-L/usr/lib64" ]	&& continue
+    [ "\$arg" = "-L/usr/lib" ]   && continue
+    set -- "\$@" "\$arg"
+done
+
 SHARED=""
 IS_SHARED=false
 
@@ -223,6 +232,12 @@ set tabsize 4
 set tabstospaces
 END
 
+cat >${PYTHONPYCACHEPREFIX}/.numpy-site.cfg <<NUMPY
+[DEFAULT]
+library_dirs = $PREFIX/lib
+include_dirs = $PREFIX/include
+NUMPY
+
 cat > $ROOT/${PYDK_PYTHON_HOST_PLATFORM}-shell.sh <<END
 #!/bin/bash
 
@@ -233,10 +248,11 @@ then
 else
     . ${ROOT}/config
     . ${ROOT}/emsdk/emsdk_env.sh
+    export PATH=$ROOT/emsdk/upstream/emscripten/system/bin:\$PATH
+    export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
 fi
 
 export PATH=${HOST_PREFIX}/bin:\$PATH
-export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 export HOME=${PYTHONPYCACHEPREFIX}
 export PLATFORM_TRIPLET=${PYDK_PYTHON_HOST_PLATFORM}
@@ -250,12 +266,6 @@ export PS1="[PyDK:wasm] \w $ "
 
 export _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__emscripten_
 
-cat >${PYTHONPYCACHEPREFIX}/.numpy-site.cfg <<NUMPY
-[DEFAULT]
-library_dirs = $PREFIX/lib
-include_dirs = $PREFIX/include
-NUMPY
-
 END
 
 cat > $HOST_PREFIX/bin/python3-wasm <<END

scripts/cpython-build-host-deps.sh

@@ -8,11 +8,19 @@ echo "
 # https://stackoverflow.com/questions/6301003/stopping-setup-py-from-installing-as-egg
 # python3 setup.py install --single-version-externally-managed --root=/
 
+# just in case
+$PIP install pip --upgrade
+
 # to remove ctypes deps
 $PIP install setuptools --upgrade
 
-# just in case
-$PIP install pip --upgrade
+HPFX=./devices/x86_64/usr/lib/python3.11
+rm $HPFX/ensurepip/_bundled/setuptools-*-py3-none-any.whl
+mv $HPFX/site-packages/setuptool* $HPFX/
+mv $HPFX/site-packages/_distutils* $HPFX/
+mv $HPFX/site-packages/pkg_resources $HPFX/
+
+
 
 export CC=clang
 

scripts/cpython-build-host.sh

@@ -31,12 +31,31 @@ then
 
 
 #export OPT="$CPOPTS -DNDEBUG -fwrapv"
+    cat $ROOT/src/cpython/Tools/wasm/config.host-wasm32-emscripten <<END
+ac_cv_lib_intl_textdomain=no
+ac_cv_func_bind_textdomain_codeset=no
+END
+
+    CONFIG_SITE=$ROOT/src/cpython/Tools/wasm/config.host-wasm32-emscripten \
     PYOPTS="--disable-ipv6 \
      --with-c-locale-coercion --without-pymalloc --without-pydebug \
      --with-ensurepip\
      --with-decimal-contextvar --disable-shared \
      --with-computed-gotos"
 
+    cat >> pyconfig.h <<END
+#ifdef HAVE_LIBINTL_H
+#undef HAVE_LIBINTL_H
+#endif
+
+#ifdef WITH_LIBINTL
+#undef WITH_LIBINTL
+#endif
+
+END
+
+
+
     # Prevent freezing bytecode with a different magic
     rm -f $HOST_PREFIX/bin/python3*
 
@@ -66,6 +85,9 @@ then
         eval make -j$(nproc) install $QUIET
         rm -rf $(find $ROOT/devices/ -type d|grep __pycache__$)
 
+        patchelf --remove-needed libintl.so.8  $HOST_PREFIX/bin/python3.11
+        sed -i 's|-lintl ||g' /opt/python-wasm-sdk/devices/x86_64/usr/bin/python3.11-config
+
         cp -Rfv $ROOT/support/__EMSCRIPTEN__.patches/. $HOST_PREFIX/lib/python3.??/
     else
         echo "

scripts/emsdk-fetch.sh

@@ -22,11 +22,10 @@ then
             ./emsdk install tot
             ./emsdk activate tot
             popd
-            tar -cpR emsdk > emsdk.tar
+            [ -f dev ] && tar -cpR emsdk > emsdk.tar
         fi
     fi
 
-
     if [ -f emsdk/emsdk_env.sh ]
     then
         echo "
@@ -79,7 +78,9 @@ then
             #embuilder build $one
         done
 
-        #tar xvfp emsdk-fix.tar
+
+# -Wno-limited-postlink-optimizations
+
 
         cat > emsdk/upstream/emscripten/emcc <<END
 #!/bin/bash
@@ -134,6 +135,8 @@ END
         sync
     fi
 
+    export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+
     if echo $PATH|grep -q $EMSDK/upstream/emscripten/system/bin
     then
         # emsdk env does not set it, but it's required for eg sdl2-config