Merge pull request #1679 from pguyot/w22/fix-mbedtls-compilation-with-emscripten

Use -Wno-unterminated-string-initialization to fix mbedtls compilation

These changes are made under both the "Apache 2.0" and the "GNU Lesser General
Public License 2.1 or later" license terms (dual license).

SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later

Author: bettio

.github/workflows/build-docs.yaml

@@ -20,6 +20,7 @@ on:
     paths:
       - '.github/workflows/**'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'doc/**'
       - 'libs/**'
       - 'src/libAtomVM/**'
@@ -33,6 +34,7 @@ on:
     paths:
       - '.github/workflows/**'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'doc/**'
       - 'libs/**'
       - 'src/libAtomVM/**'

.github/workflows/check-formatting.yaml

@@ -11,13 +11,15 @@ on:
     paths:
       - '.github/workflows/**'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'src/**'
       - 'tests/**'
       - '**/*.erl'
   pull_request:
     paths:
       - '.github/workflows/**'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'src/**'
       - 'tests/**'
       - '**/*.erl'

.github/workflows/esp32-build.yaml

@@ -11,6 +11,7 @@ on:
     paths:
       - '.github/workflows/esp32-build.yaml'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'libs/**'
       - 'src/platforms/esp32/**'
       - 'src/platforms/esp32/**/**'
@@ -19,9 +20,13 @@ on:
   pull_request:
     paths:
       - '.github/workflows/esp32-build.yaml'
+      - 'CMakeLists.txt'
+      - 'CMakeModules/**'
+      - 'libs/**'
       - 'src/platforms/esp32/**'
       - 'src/platforms/esp32/**/**'
       - 'src/libAtomVM/**'
+      - 'tools/packbeam/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}

.github/workflows/esp32-mkimage.yaml

@@ -11,6 +11,7 @@ on:
     paths:
       - '.github/workflows/esp32-mkimage.yaml'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'libs/**'
       - 'src/platforms/esp32/**'
       - 'src/platforms/esp32/**/**'
@@ -19,9 +20,13 @@ on:
   pull_request:
     paths:
       - '.github/workflows/esp32-mkimage.yaml'
+      - 'CMakeLists.txt'
+      - 'CMakeModules/**'
+      - 'libs/**'
       - 'src/platforms/esp32/**'
       - 'src/platforms/esp32/**/**'
       - 'src/libAtomVM/**'
+      - 'tools/packbeam/**'
 
 permissions:
   contents: write

.github/workflows/esp32-simtest.yaml

@@ -12,6 +12,7 @@ on:
     paths:
       - ".github/workflows/esp32-simtest.yaml"
       - "CMakeLists.txt"
+      - 'CMakeModules/**'
       - "libs/**"
       - "src/platforms/esp32/**"
       - "src/platforms/esp32/**/**"
@@ -20,9 +21,13 @@ on:
   pull_request:
     paths:
       - ".github/workflows/esp32-simtest.yaml"
+      - "CMakeLists.txt"
+      - 'CMakeModules/**'
+      - "libs/**"
       - "src/platforms/esp32/**"
       - "src/platforms/esp32/**/**"
       - "src/libAtomVM/**"
+      - "tools/packbeam/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}

.github/workflows/pico-build.yaml

@@ -11,6 +11,7 @@ on:
     paths:
       - '.github/workflows/pico-build.yaml'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'libs/**'
       - 'src/platforms/rp2/**'
       - 'src/platforms/esp32/test/main/test_erl_sources/test_crypto.erl'
@@ -19,6 +20,7 @@ on:
     paths:
       - '.github/workflows/pico-build.yaml'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'libs/**'
       - 'src/platforms/rp2/**'
       - 'src/platforms/esp32/test/main/test_erl_sources/test_crypto.erl'

.github/workflows/publish-docs.yaml

@@ -20,6 +20,7 @@ on:
     paths:
       - '.github/workflows/publish-docs.yaml'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'doc/**'
       - 'libs/**'
       - 'src/libAtomVM/**'

.github/workflows/stm32-build.yaml

@@ -11,12 +11,14 @@ on:
     paths:
       - '.github/workflows/stm32-build.yaml'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'src/platforms/stm32/**'
       - 'src/libAtomVM/**'
   pull_request:
     paths:
       - '.github/workflows/stm32-build.yaml'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'src/platforms/stm32/**'
       - 'src/libAtomVM/**'
 

.github/workflows/wasm-build.yaml

@@ -11,13 +11,15 @@ on:
     paths:
       - '.github/workflows/wasm-build.yaml'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'libs/**'
       - 'src/platforms/emscripten/**'
       - 'src/libAtomVM/**'
   pull_request:
     paths:
       - '.github/workflows/wasm-build.yaml'
       - 'CMakeLists.txt'
+      - 'CMakeModules/**'
       - 'libs/**'
       - 'src/platforms/emscripten/**'
       - 'src/libAtomVM/**'

CMakeModules/FetchMbedTLS.cmake

@@ -22,10 +22,37 @@ include(FetchContent)
 
 FetchContent_Declare(
   mbedtls
-  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/mbedtls.patch"
   GIT_REPOSITORY http://github.com/mbed-TLS/mbedtls.git
   GIT_TAG        v3.6.3.1
   GIT_SHALLOW    1
 )
 
-FetchContent_MakeAvailable(mbedtls)
+include(CheckCompilerFlag)
+check_compiler_flag(C -Wno-unterminated-string-initialization compiler_supports_unterminated_string_initialization)
+
+if (${compiler_supports_unterminated_string_initialization})
+    get_property(
+        compile_options
+        DIRECTORY
+        PROPERTY COMPILE_OPTIONS
+    )
+
+    set_property(
+        DIRECTORY
+        APPEND
+        PROPERTY COMPILE_OPTIONS -Wno-unterminated-string-initialization
+    )
+
+    FetchContent_MakeAvailable(mbedtls)
+
+    set_property(
+        DIRECTORY
+        PROPERTY COMPILE_OPTIONS ${compile_options}
+    )
+
+    unset(compile_options)
+else()
+    FetchContent_MakeAvailable(mbedtls)
+endif ()
+
+unset(compiler_supports_unterminated_string_initialization)