build(docker): use emulated pthreads

Until wasmtime supports threads in its C-API.

Author: thewtex

packages/core/typescript/itk-wasm/src/cli/default-image-tag.js

@@ -1,2 +1,2 @@
-const defaultImageTag = '20250109-e4058d74'
+const defaultImageTag = '20250123-18b3eff9'
 export default defaultImageTag

src/docker/itk-wasm-base/Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE=docker.io/dockcross/web-wasm
 ARG HOST_ARCH=amd64
-FROM $BASE_IMAGE:20250107-aac97df-$HOST_ARCH
+FROM $BASE_IMAGE:20250123-74d1a0b-$HOST_ARCH
 ARG BASE_IMAGE
 
 LABEL maintainer="Matt McCormick matt@mmmccormick.com"
@@ -51,8 +51,6 @@ ARG CXXFLAGS
 ENV LDFLAGS=${LDFLAGS:-"-flto -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB"}
 ENV CFLAGS=${CFLAGS:-"-msimd128 -flto -Wno-warn-absolute-paths -DITK_WASM_NO_FILESYSTEM_IO"}
 ENV CXXFLAGS=${CXXFLAGS:-"${CFLAGS}"}
-# Add our flags to the toolchain file
-COPY ./wasi-sdk-pthread-itkwasm.cmake /opt/wasi-sdk/share/cmake/wasi-sdk-pthread.cmake
 
 RUN mkdir ITK-build && \
   cd ITK-build && \
@@ -89,6 +87,9 @@ RUN mkdir ITK-build && \
     -DDCMTK_WITH_THREADS:BOOL=OFF \
     -DDCMTK_BUILD_APPS:BOOL=OFF \
     -DNO_FLOAT_EXCEPTIONS:BOOL=ON \
+    -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
+    -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
+    -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
     ../ITK && \
   ninja && \
   find . -name '*.o' -delete && \

src/docker/itk-wasm-base/build.sh

@@ -68,7 +68,7 @@ if $wasi; then
           --build-arg VCS_REF=${VCS_REF} \
           --build-arg VCS_URL=${VCS_URL} \
           --build-arg BUILD_DATE=${BUILD_DATE} \
-          --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-threads \
+          --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-emulated-threads \
           --build-arg LDFLAGS="${wasi_ld_flags}" \
           --build-arg CFLAGS="${wasi_c_flags}" \
           $script_dir $@
@@ -81,7 +81,7 @@ if $wasi; then
                         --build-arg VCS_REF=${VCS_REF} \
                         --build-arg VCS_URL=${VCS_URL} \
                         --build-arg BUILD_DATE=${BUILD_DATE} \
-                        --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-threads \
+                        --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-emulated-threads \
                         --build-arg LDFLAGS="${wasi_ld_flags}" \
                         --build-arg CFLAGS="${wasi_c_flags}" \
                         $script_dir $@
@@ -123,7 +123,7 @@ if $debug; then
             --build-arg VCS_REF=${VCS_REF} \
             --build-arg VCS_URL=${VCS_URL} \
             --build-arg BUILD_DATE=${BUILD_DATE} \
-            --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-threads \
+            --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-emulated-threads \
             --build-arg LDFLAGS="${wasi_debug_ld_flags}" \
             --build-arg CFLAGS="${wasi_debug_c_flags}" \
             $script_dir $@
@@ -136,7 +136,7 @@ if $debug; then
                 --build-arg VCS_REF=${VCS_REF} \
                 --build-arg VCS_URL=${VCS_URL} \
                 --build-arg BUILD_DATE=${BUILD_DATE} \
-                --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-threads \
+                --build-arg BASE_IMAGE=docker.io/dockcross/web-wasi-emulated-threads \
                 --build-arg LDFLAGS="${wasi_debug_ld_flags}" \
                 --build-arg CFLAGS="${wasi_debug_c_flags}" \
                 $script_dir $@

src/docker/itk-wasm-base/clang++-wasi-threads-sysroot.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+exec ${WASI_SDK_PATH}/bin/clang++ --target=wasm32-wasi-threads --sysroot=${WASI_SYSROOT} "$@"

src/docker/itk-wasm-base/clang-wasi-threads-sysroot.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+exec ${WASI_SDK_PATH}/bin/clang --target=wasm32-wasi-threads --sysroot=${WASI_SYSROOT} "$@"