From 6634822528b340e7b7e4dbb0149646a622b0be7f Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 6 Feb 2023 09:47:09 -0500 Subject: [PATCH 1/2] build(wasi): Add support for printscan-long-double Explicitly required for std::strtold, used by CLI11. --- CMakeLists.txt | 5 ++--- src/docker/itk-wasm-base/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87cae69fd..e795ccff5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,9 +50,8 @@ FetchContent_Declare( ) set(CLI11_GIT_REPOSITORY "https://github.com/CLIUtils/CLI11") -# std::strtold patch -set(CLI11_GIT_REPOSITORY "https://github.com/thewtex/CLI11") -set(CLI11_GIT_TAG "82d4e022cdfcf18d1fc59684bdc6977ea34053f4") +# v2.3.2 +set(CLI11_GIT_TAG "291c58789c031208f08f4f261a858b5b7083e8e2") FetchContent_Declare( cli11 GIT_REPOSITORY ${CLI11_GIT_REPOSITORY} diff --git a/src/docker/itk-wasm-base/build.sh b/src/docker/itk-wasm-base/build.sh index 187198ede..3236948e3 100755 --- a/src/docker/itk-wasm-base/build.sh +++ b/src/docker/itk-wasm-base/build.sh @@ -25,13 +25,13 @@ for param; do done set -- "${newparams[@]}" # overwrites the original positional params -wasi_ld_flags="-flto -lwasi-emulated-process-clocks -lwasi-emulated-signal" +wasi_ld_flags="-flto -lwasi-emulated-process-clocks -lwasi-emulated-signal -lc-printscan-long-double" wasi_c_flags="-flto -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL" emscripten_debug_ld_flags="-fno-lto -s ALLOW_MEMORY_GROWTH=1" emscripten_debug_c_flags="-fno-lto -Wno-warn-absolute-paths" -wasi_debug_ld_flags="-fno-lto -lwasi-emulated-process-clocks -lwasi-emulated-signal" +wasi_debug_ld_flags="-fno-lto -lwasi-emulated-process-clocks -lwasi-emulated-signal -lc-printscan-long-double" wasi_debug_c_flags="-fno-lto -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL" docker build -t itkwasm/emscripten-base:latest \ From 89b7886b291a12ce58e4a86d3d6d3c768ad7e6bb Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 6 Feb 2023 10:14:09 -0500 Subject: [PATCH 2/2] feat(itk-wasm-cli): Update default Docker image for 20230206-66348225 --- src/itk-wasm-cli.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/itk-wasm-cli.js b/src/itk-wasm-cli.js index 62085b0e0..daee83b03 100755 --- a/src/itk-wasm-cli.js +++ b/src/itk-wasm-cli.js @@ -13,7 +13,7 @@ const program = new Command() // Array of types that will require an import from itk-wasm const typesRequireImport = ['Image'] -const defaultImageTag = '20230201-d4552761' +const defaultImageTag = '20230206-66348225' function processCommonOptions() { const options = program.opts()