consolidate libpython wasi

Author: pmp-p

scripts/cpython-build-emsdk.sh

@@ -203,6 +203,8 @@ END
         GIL="--disable-gil"
         sed -i 's|{ABIFLAGS}t|{ABIFLAGS}|g' configure
         sed -i 's|{ABIFLAGS}t|{ABIFLAGS}|g' configure.ac
+        sed -i 's|--wasi preview2||g' configure
+        sed -i 's|--wasi preview2||g' configure.ac
     else
         GIL=""
     fi

scripts/cpython-build-wasisdk.sh

@@ -64,7 +64,7 @@ END
 
         LDSHARED="${SDKROOT}/wasisdk/upstream/bin/wasm-ld --no-entry" CONFIG_SITE=$PYSRC/Tools/wasm/config.site-wasm32-wasisdk \
         $PYSRC/configure -C \
-        --with-c-locale-coercion --without-pymalloc --disable-ipv6  --with-ensurepip=no \
+        --with-c-locale-coercion --without-pymalloc --disable-ipv6  --disable-gil --with-ensurepip=no \
         --prefix=${PREFIX} \
         --host=wasm32-unknown-wasi --with-suffix=.wasm \
         --build=$($PYSRC/config.guess) \
@@ -88,16 +88,32 @@ END
 
         if make && make install
         then
-            echo done
-#                cat > ${SDKROOT}/bin/python3 <<END
-##!/bin/bash
-#wasmtime --dir=/ --dir=. ${SDKROOT}/bin/python3.wasm \$@
-#END
-#                chmod +x ${SDKROOT}/bin/python3
-#                ln ${SDKROOT}/bin/python3 ${SDKROOT}/bin/python
-            fi
+            sed -i 's|cpython/pthread_stubs|pthread|g' ${PREFIX}/include/python${PYBUILD}/cpython/pythread.h
+        fi
     popd
 
+    pushd ${SDKROOT}/wasisdk
+        if [ -f libpython${PYBUILD}.a ]
+        then
+            echo already moved initial libpython${PYBUILD}.a
+        else
+            mv /opt/python-wasm-sdk/devices/wasisdk/usr/lib/libpython${PYBUILD}.a /opt/python-wasm-sdk/wasisdk/
+        fi
+
+        LINKALL="/opt/python-wasm-sdk/wasisdk/libpython3.13.a \
+         /opt/python-wasm-sdk/build/cpython-wasi/Modules/_decimal/libmpdec/libmpdec.a \
+         /opt/python-wasm-sdk/build/cpython-wasi/Modules/_hacl/libHacl_Hash_SHA2.a \
+         /opt/python-wasm-sdk/build/cpython-wasi/Modules/expat/libexpat.a \
+         /opt/python-wasm-sdk/wasisdk/upstream/share/wasi-sysroot/lib/wasm32-wasi/libbz2.a \
+         /opt/python-wasm-sdk/wasisdk/upstream/share/wasi-sysroot/lib/wasm32-wasi/libz.a \
+         /opt/python-wasm-sdk/wasisdk/upstream/share/wasi-sysroot/lib/wasm32-wasi/libsqlite3.a \
+         /opt/python-wasm-sdk/wasisdk/upstream/share/wasi-sysroot/lib/wasm32-wasi/libuuid.a"
+
+        wasi-c -nostdlib -fpic -r -Wl,--whole-archive -o libpython${PYBUILD}.o $LINKALL
+        llvm-ar rcs ${PREFIX}/lib/libpython${PYBUILD}.a libpython${PYBUILD}.o
+    popd
+
+
 else
     echo cannot find PYTHON_FOR_BUILD=$PYTHON_FOR_BUILD
 fi

wasisdk/hotfix/cxa.c

@@ -0,0 +1,9 @@
+#if defined(__wasi__)
+extern "C" {
+void *
+__cxa_allocate_exception(size_t thrown_size) { return NULL; }
+void
+__cxa_throw(void *thrown_exception, std::type_info *tinfo, void *dest) {}
+}
+#endif
+

wasisdk/hotfix/pwd.h

@@ -0,0 +1,28 @@
+#ifndef _WASIX_PWD_H
+#define _WASIX_PWD_H
+
+#include <unistd.h>
+#include <features.h>
+#include <bits/alltypes.h>
+
+#define __need_size_t
+#include <stddef.h>
+
+/* A record in the user database.  */
+struct passwd
+{
+  char *pw_name;		/* Username.  */
+  char *pw_passwd;		/* Hashed passphrase, if shadow database
+                                   not in use (see shadow.h).  */
+  uid_t pw_uid;		        /* User ID.  */
+  gid_t pw_gid;		        /* Group ID.  */
+  char *pw_gecos;		/* Real name.  */
+  char *pw_dir;			/* Home directory.  */
+  char *pw_shell;		/* Shell program.  */
+};
+
+struct passwd *getpwnam(const char *name);
+
+struct passwd *getpwuid(uid_t uid);
+
+#endif