3.1.61.12pre

Author: pmp-p

scripts/wasisdk-fetch.sh

@@ -40,12 +40,11 @@ pushd ${SDKROOT}
 list(APPEND CMAKE_MODULE_PATH "${WASISDK}/share/cmake/Modules")
 
 
-# This is arbitrary, AFAIK, for now.
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required(VERSION 3.10.0)
 set(CMAKE_SYSTEM_NAME WASI)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR wasm32)
-set(triple wasm32-wasi)
+set(triple wasm32-wasip1)
 
 set(WASI True)
 option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
@@ -56,8 +55,8 @@ set(COMPILER_SUPPORTS_FEXCEPTIONS FALSE)
 #add_compile_options(-fpic)
 #add_compile_options(-fno-exceptions)
 
+set(WASI_SDK_PREFIX "${WASISDK}/upstream")
 set(CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
-
 set(CMAKE_CROSSCOMPILING 1)
 
 
@@ -95,9 +94,9 @@ set(CMAKE_CXX_PLATFORM_ID "wasi")
 set(CMAKE_ASM_COMPILER "${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX}")
 set(CMAKE_AR "${WASI_SDK_PREFIX}/bin/llvm-ar${WASI_HOST_EXE_SUFFIX}")
 set(CMAKE_RANLIB "${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX}")
-set(CMAKE_C_COMPILER_TARGET ${triple})
-set(CMAKE_CXX_COMPILER_TARGET ${triple})
-set(CMAKE_ASM_COMPILER_TARGET ${triple})
+set(CMAKE_C_COMPILER_TARGET \${triple})
+set(CMAKE_CXX_COMPILER_TARGET \${triple})
+set(CMAKE_ASM_COMPILER_TARGET \${triple})
 
 # Don't look in the sysroot for executables to run during the build
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

wasisdk/bin/wasi-cmake

@@ -1,12 +1,11 @@
 #!/bin/bash
-SDKROOT=${SDKROOT:-/opt/python-wasm-sdk}
+SDKROOT=${SDKROOT:-/tmp/sdk}
 if . $SDKROOT/wasisdk/wasisdk_env.sh
 then
     CMAKE=$1
     shift
     $CMAKE \
      -DCMAKE_SYSTEM_NAME=WASI \
-     -DCMAKE_INSTALL_PREFIX=$PREFIX \
+     -DCMAKE_INSTALL_PREFIX=$WASI_SYSROOT \
     "$@"
 fi
-

wasisdk/hotfix/patch.h

@@ -5,6 +5,8 @@
 
 SCOPE FILE *
 popen(const char *command, const char *type){
+    (void)command;
+    (void)type;
     return NULL;
 }
 
@@ -27,6 +29,7 @@ geteuid(void) {
 #include <sys/types.h> // for mode_t
 SCOPE mode_t
 umask(mode_t mask) {
+    (void)mask;
 	return 18;
 }
 
@@ -35,6 +38,8 @@ umask(mode_t mask) {
 
 SCOPE int
 sdk_chmod(const char * path, int mode_t) {
+    (void)path;
+    (void)mode_t;
     return 0;
 }
 #define chmod(path, mode) sdk_chmod(path, mode)
@@ -109,7 +114,12 @@ mkstemp(char *tmpl) {
 SCOPE int
 // getpwuid_r(uid_t uid, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result) {
 sdk_getpwuid_r(uid_t uid, void *pwd, char *buf, size_t buflen, void **result) {
-  return ENOENT;
+    (void)uid;
+    (void)pwd;
+    (void)buf;
+    (void)buflen;
+    (void)result;
+    return ENOENT;
 }
 #define getpwuid_r(uid, pwd, buf, buflen, result) sdk_getpwuid_r(uid, pwd, buf, buflen, result)
 
@@ -209,6 +219,9 @@ sdk_tmpfile(void) {
 
     SCOPE int
     lockf(int fd, int cmd, off_t len) {
+        (void)fd;
+        (void)cmd;
+        (void)len;
         return 0;
     }
 
@@ -228,6 +241,8 @@ sdk_tmpfile(void) {
 
     SCOPE int
     sdk_getrusage(int who, void *usage) {
+        (void)who;
+        (void)usage;
         return -1;
     }
 #   define getrusage(who, usage) sdk_getrusage(who, usage)
@@ -274,10 +289,14 @@ sdk_tmpfile(void) {
 #   define __wasm_exception_handling__
 #   include <setjmp.h>
     SCOPE int sdk_sigsetjmp(sigjmp_buf env, int savesigs) {
+        (void)env;
+        (void)savesigs;
         return 0;
     }
 #   define sigsetjmp(env, savesigs) sdk_sigsetjmp(env, savesigs)
     SCOPE void sdk_siglongjmp(sigjmp_buf env, int val) {
+        (void)env;
+        (void)val;
         puts("# 217:" __FILE__ ": siglongjmp STUB");
     }
 #   define siglongjmp(env, val) sdk_siglongjmp(env, val)
@@ -298,8 +317,8 @@ extern int __wasi_fd_seek(int fd,int  offset,int  whence, unsigned long long *re
 
 #   include <wasi/api.h>
     SCOPE void sdk_exit(int ec) {
+        void * base = 0 ;
         printf("EXIT(%d)\r\n", ec);
-        const char * base = 0 ;
         memset(base, ec, 1);
         abort();
 
@@ -309,14 +328,19 @@ extern int __wasi_fd_seek(int fd,int  offset,int  whence, unsigned long long *re
 #   define exit(ec) sdk_exit(ec)
 
 
+
     SCOPE int sdk_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset) {
+        (void)how;
+        (void)set;
+        (void)oldset;
         return 0;
     }
 #   define pthread_sigmask(how, set, oldset) sdk_pthread_sigmask(how, set, oldset)
 
 
 
     SCOPE int sdk_sigpending(sigset_t *set) {
+        (void)set;
         return -1;
     }
 #   define sigpending(set) sdk_sigpending(set)

wasisdk/wasisdk_env.sh

@@ -36,13 +36,12 @@ then
     export PATH="${WASISDK}/bin:${WASI_SDK_PREFIX}/bin:$PATH"
 
     # instruct pkg-config to use wasi target root
-    export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${WASI_SYSROOT}/lib/wasm32-wasi/pkgconfig"
-
-    # for thirparty prebuilts .pc in sdk
     export PKG_CONFIG_LIBDIR="${WASI_SYSROOT}/lib/wasm32-wasi/pkgconfig"
     #:${WASI_SYSROOT}/share/pkgconfig"
     export PKG_CONFIG_SYSROOT_DIR="${WASI_SYSROOT}"
 
+    # for thirparty prebuilts .pc in sdk
+    export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${WASI_SYSROOT}/lib/pkgconfig"
 
     export PS1="[PyDK:wasi] \w $ "