3.1.66final / 3.12.6 / 13rc2

pygame-web · Sep 13, 2024 · e999dd4 · e999dd4
1 parent ccd5fcc
commit e999dd4
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
        BUILDS: 3.12 3.13
-       EMFLAVOUR: tot
+       EMFLAVOUR: 3.1.66
 
     steps:
     - uses: actions/checkout@v3.3.0

diff --git a/python-wasi-sdk.sh b/python-wasi-sdk.sh
@@ -203,7 +203,7 @@ parse_git_branch() {
      git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
 }
 
-export PS1="[PyDK:wasi]  \[\e[32m\]\w \[\e[91m\]\$(parse_git_branch)\[\e[00m\]\$ "
+export PS1="[PyDK:wasi] \[\e[32m\]\w \[\e[91m\]\$(parse_git_branch)\[\e[00m\]\$ "
 
 END
             chmod +x ${SDKROOT}/python3-wasi ${SDKROOT}/wasm32-wasi-shell.sh

diff --git a/python-wasm-sdk.sh b/python-wasm-sdk.sh
@@ -203,7 +203,7 @@ parse_git_branch() {
      git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
 }
 
-export PS1="[PyDK:wasi]  \[\e[32m\]\w \[\e[91m\]\$(parse_git_branch)\[\e[00m\]\$ "
+export PS1="[PyDK:wasi] \[\e[32m\]\w \[\e[91m\]\$(parse_git_branch)\[\e[00m\]\$ "
 
 END
             chmod +x ${SDKROOT}/python3-wasi ${SDKROOT}/wasm32-wasi-shell.sh

diff --git a/scripts/cpython-build-host.sh b/scripts/cpython-build-host.sh
@@ -6,6 +6,8 @@ export PYTHON_FOR_BUILD=${PYTHON_FOR_BUILD:-${HPY}}
 
 mkdir -p build/cpython-host
 
+[ -L $HOST_PREFIX/lib64 ] || ln -s $HOST_PREFIX/lib $HOST_PREFIX/lib64
+
 if $REBUILD
 then
     echo "

diff --git a/scripts/cpython-fetch.sh b/scripts/cpython-fetch.sh
@@ -45,12 +45,13 @@ fi
 
 if echo $PYBUILD |grep -q 13$
 then
-#    wget -q -c https://www.python.org/ftp/python/3.13.0/Python-3.13.0b4.tar.xz
-#    tar xf Python-3.13.0b4.tar.xz
-#    ln -s Python-3.13.0b4 cpython${PYBUILD}
-    wget -q -c https://www.python.org/ftp/python/3.13.0/Python-3.13.0rc1.tar.xz
-    tar xf Python-3.13.0rc1.tar.xz
-    ln -s Python-3.13.0rc1 cpython${PYBUILD}
+#    wget -q -c https://www.python.org/ftp/python/3.13.0/Python-3.13.0rc1.tar.xz
+#    tar xf Python-3.13.0rc1.tar.xz
+#    ln -s Python-3.13.0rc1 cpython${PYBUILD}
+
+    wget -q -c https://www.python.org/ftp/python/3.13.0/Python-3.13.0rc2.tar.xz
+    tar xf Python-3.13.0rc2.tar.xz
+    ln -s Python-3.13.0rc2 cpython${PYBUILD}
 
     mkdir $ROOT/devices/emsdk/usr/lib $ROOT/devices/$(arch)/usr/lib -p
     ln -s $ROOT/devices/$(arch)/usr/lib/python3.13t  $ROOT/devices/$(arch)/usr/lib/python3.13
@@ -63,17 +64,17 @@ fi
 
 if echo $PYBUILD |grep -q 12$
 then
-    wget -q -c https://www.python.org/ftp/python/3.12.5/Python-3.12.5.tar.xz
-    tar xf Python-3.12.5.tar.xz
-    ln -s Python-3.12.5 cpython${PYBUILD}
+    wget -q -c https://www.python.org/ftp/python/3.12.6/Python-3.12.6.tar.xz
+    tar xf Python-3.12.6.tar.xz
+    ln -s Python-3.12.6 cpython${PYBUILD}
 fi
 
 
 if echo $PYBUILD | grep -q 11$
 then
-    wget -q -c https://www.python.org/ftp/python/3.11.9/Python-3.11.9.tar.xz
-    tar xf Python-3.11.9.tar.xz
-    ln -s Python-3.11.9 cpython${PYBUILD}
+    wget -q -c https://www.python.org/ftp/python/3.11.10/Python-3.11.10.tar.xz
+    tar xf Python-3.11.10.tar.xz
+    ln -s Python-3.11.10 cpython${PYBUILD}
 fi
 
 popd

diff --git a/wasisdk/bin/wasi b/wasisdk/bin/wasi
@@ -27,12 +27,12 @@ else
     # wasi assembly
     WASI_ALL="${WASI_CFG} ${WASI_PATCH} ${WASI_DEF} -fPIC -fno-rtti -fno-exceptions -z stack-size=131072"
 
-    WASI_ALL="$WASI_ALL -Wno-unused-but-set-variable -Wno-unused-command-line-argument -Wno-unsupported-floating-point-opt"
+    WASI_ALL="$WASI_ALL -Wno-unused-but-set-variable -Wno-unused-command-line-argument -Wno-unsupported-floating-point-opt -Wno-nullability-completeness"
 
     # wasi linking
     WASI_LNK="-lwasi-emulated-getpid -lwasi-emulated-mman -lwasi-emulated-signal -lwasi-emulated-process-clocks"
 
-    export CC="${WASI_SDK_PREFIX}/bin/clang ${WASI_ALL}"
+    export CC="${WASI_SDK_PREFIX}/bin/clang ${WASI_ALL} ${WASI_CFLAGS}"
     export CXX="${WASI_SDK_PREFIX}/bin/clang++ ${WASI_ALL}"
     export CPP="${WASI_SDK_PREFIX}/bin/clang-cpp ${WASI_CFG} ${WASI_DEF}"
 fi

diff --git a/wasisdk/hotfix/dlfcn.h b/wasisdk/hotfix/dlfcn.h
@@ -28,13 +28,13 @@ dlclose(void *) {
 static const char *errormsg = "dlerror";
 
 static char *
-dlerror(void) { 
-    return (char *)dlerror;    
+dlerror(void) {
+    return (char *)dlerror;
 }
 
 static void *
-dlopen(const char *, int) {
-    puts("void *dlopen(const char *, int)");
+dlopen(const char *filename, int flags) {
+    fprintf(stderr,"void *dlopen(const char *filename = %s, int flags=)", filename, flags);
     return NULL;
 }
 

diff --git a/wasisdk/hotfix/netdb.h b/wasisdk/hotfix/netdb.h
@@ -52,10 +52,11 @@ struct addrinfo {
 #define EAI_SYSTEM     -11
 #define EAI_OVERFLOW   -12
 
-int getaddrinfo (const char *__restrict, const char *__restrict, const struct addrinfo *__restrict, struct addrinfo **__restrict);
-void freeaddrinfo (struct addrinfo *);
-int getnameinfo (const struct sockaddr *__restrict, socklen_t, char *__restrict, socklen_t, char *__restrict, socklen_t, int);
-const char *gai_strerror(int);
+//int getaddrinfo (const char *__restrict, const char *__restrict, const struct addrinfo *__restrict, struct addrinfo **__restrict);
+//void freeaddrinfo (struct addrinfo *);
+//int getnameinfo (const struct sockaddr *__restrict, socklen_t, char *__restrict, socklen_t, char *__restrict, socklen_t, int);
+#define getnameinfo(...) (-1)
+//const char *gai_strerror(int);
 
 
 /* Legacy functions follow (marked OBsolete in SUS) */

diff --git a/wasisdk/hotfix/pwd.h b/wasisdk/hotfix/pwd.h
@@ -21,8 +21,12 @@ struct passwd
   char *pw_shell;		/* Shell program.  */
 };
 
-struct passwd *getpwnam(const char *name);
+static struct passwd *getpwnam(const char *name) {
+    return NULL;
+}
 
-struct passwd *getpwuid(uid_t uid);
+static struct passwd *getpwuid(uid_t uid) {
+    return NULL;
+}
 
 #endif