fix ossp uuid target folder

Author: pmp-p

sources.wasm/5010-gdal.sh renamed to 7000-gdal.sh

@@ -91,7 +91,7 @@ export PYDK_PYTHON_HOST_PLATFORM=wasm32-${WASM_FLAVOUR}-emscripten
 # ============== wasi sdk ===============
 
 # stable
-export WASI_SDK=${WASI_SDK:-23.0}
+export WASI_SDK=${WASI_SDK:-24.0}
 export WASI_SDK_MAJOR=$(echo ${WASI_SDK}|cut -d. -f1)
 export WASI_SDK_MINOR=$(echo ${WASI_SDK}|cut -d. -f2)
 export WASI_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_MAJOR}/wasi-sdk-${WASI_SDK}-$(arch)-linux.tar.gz

config

@@ -14,7 +14,7 @@ export SDKROOT
 export CIVER=${CIVER:-$DISTRIB}
 export CI=true
 
-if echo $0|grep -q python-wasm-sdk
+if echo $0|grep -q python-wasm-sdk\.sh
 then
     echo " * adding emsdk to wasm-sdk"
     emsdk=true
@@ -119,7 +119,9 @@ END
         then
             echo "keeping installed wasmtime and wasi binaries"
         else
-            wget https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasmtime-v22.0.0-x86_64-linux.tar.xz -O-|xzcat|tar xfv -
+            #wget https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasmtime-v22.0.0-x86_64-linux.tar.xz \
+            wget https://github.com/bytecodealliance/wasmtime/releases/download/v23.0.2/wasmtime-v23.0.2-$(arch)-linux.tar.xz
+             -O-|xzcat|tar xfv -
             mv -vf $(find wasmtime*|grep /wasmtime$) ${SDKROOT}/devices/$(arch)/usr/bin
         fi
 

python-wasi-sdk.sh

@@ -14,7 +14,7 @@ export SDKROOT
 export CIVER=${CIVER:-$DISTRIB}
 export CI=true
 
-if echo $0|grep -q python-wasm-sdk
+if echo $0|grep -q python-wasm-sdk\.sh
 then
     echo " * adding emsdk to wasm-sdk"
     emsdk=true
@@ -119,7 +119,9 @@ END
         then
             echo "keeping installed wasmtime and wasi binaries"
         else
-            wget https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasmtime-v22.0.0-x86_64-linux.tar.xz -O-|xzcat|tar xfv -
+            #wget https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasmtime-v22.0.0-x86_64-linux.tar.xz \
+            wget https://github.com/bytecodealliance/wasmtime/releases/download/v23.0.2/wasmtime-v23.0.2-$(arch)-linux.tar.xz
+             -O-|xzcat|tar xfv -
             mv -vf $(find wasmtime*|grep /wasmtime$) ${SDKROOT}/devices/$(arch)/usr/bin
         fi
 

python-wasm-sdk.sh

@@ -176,7 +176,7 @@ END
 
         curl -fsSL https://bun.sh/install | bash
 
-        npm install --prefix $ROOT/emsdk/node/??.??.* -g pnpm@^8.0.0
+        npm install --prefix $ROOT/emsdk/node/??.??.* -g pnpm@^9.0.0
 
 # maybe rewrite that in python and move it to emcc.py
 

scripts/emsdk-fetch.sh

@@ -41,7 +41,7 @@ END
             mv $PREFIX/include/uuid.h $EMSDK/upstream/emscripten/cache/sysroot/include/ossp/
             cp -r $EMSDK/upstream/emscripten/cache/sysroot/include/ossp $PREFIX/include/
             mv $PREFIX/lib/libuuid.a $PREFIX/lib/libossp-uuid.a
-            cp $PREFIX/lib/libossp-uuid.a $EMSDK/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/
+            cp $PREFIX/lib/libossp-uuid.a $EMSDK/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten/pic
             rm $PREFIX/lib/libuuid.la
         else
             echo "

sources.wasm/9000-uuid-ossp.sh

@@ -196,14 +196,16 @@ umask(mode_t mask) {
 // pwd.h
 
 static int
-getpwuid_r(uid_t uid, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result) {
+//getpwuid_r(uid_t uid, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result) {
+getpwuid_r(uid_t uid, void *pwd, char *buf, size_t buflen, void **result) {
   return ENOENT;
 }
 
 
 static int
 kill(pid_t pid, int sig) {
 	puts("nokill");
+    return 0;
 }
 
 
@@ -256,5 +258,46 @@ setsockopt(int socket, int level, int option_name, const void *option_value, soc
 
 
 
+#define SOCK_RAW 3
+#define SO_ERROR 0x1007
+
+static struct servent *
+getservbyname(const char *name, const char *proto) {
+    return NULL;
+}
+
+static struct servent *
+getservbyport(int port, const char *proto) {
+    return NULL;
+}
 
+static struct protoent *
+getprotobyname(const char *name) {
+    return NULL;
+}
+static struct hostent *
+gethostbyname(const char *name){
+    return NULL;
+}
 
+static struct hostent *
+gethostbyaddr(const void *addr, socklen_t len, int type) {
+    return NULL;
+}
+
+static struct protoent *
+getprotoent(void) {
+    return NULL;
+}
+
+static const char cc_hstrerror[] = "hstrerror";
+
+static int * __h_errno_location(void){
+    return NULL;
+}
+
+static const char *
+hstrerror(int ecode)
+{
+    return &cc_hstrerror[0];
+}