From 64f016763627845bcbe07a9e635a05c89ec4ec35 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 2 Dec 2024 15:25:46 +0100 Subject: [PATCH 1/2] fix(catch2): use correct syntax for linker flags GCC accepts both '-Wl,-u symbol' and '-u symbol' when invoked as a linker, while clang accepts '-u' only. --- catch2/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catch2/CMakeLists.txt b/catch2/CMakeLists.txt index 5d6c31c974..f0542375e1 100644 --- a/catch2/CMakeLists.txt +++ b/catch2/CMakeLists.txt @@ -15,7 +15,7 @@ idf_build_get_property(target IDF_TARGET) if(NOT target STREQUAL "linux") target_link_libraries(${catch_target} PUBLIC idf::pthread) # Work around a linking dependency issue in ESP-IDF - target_link_libraries(${COMPONENT_LIB} PUBLIC "-Wl,-u getentropy") + target_link_options(${COMPONENT_LIB} INTERFACE "-u getentropy") endif() # If console component is present in the build, include the console From 2767e3a8cd90e6476017a3143fee37599183a111 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 2 Dec 2024 15:26:22 +0100 Subject: [PATCH 2/2] change(catch2): upgrade to v3.7.1 --- catch2/Catch2 | 2 +- catch2/idf_component.yml | 2 +- catch2/sbom_catch2.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/catch2/Catch2 b/catch2/Catch2 index 31588bb4f5..fa43b77429 160000 --- a/catch2/Catch2 +++ b/catch2/Catch2 @@ -1 +1 @@ -Subproject commit 31588bb4f56b638dd5afc28d3ebff9b9dcefb88d +Subproject commit fa43b77429ba76c462b1898d6cd2f2d7a9416b14 diff --git a/catch2/idf_component.yml b/catch2/idf_component.yml index 6294ca6dc5..4164bdb8a9 100644 --- a/catch2/idf_component.yml +++ b/catch2/idf_component.yml @@ -1,4 +1,4 @@ -version: "3.7.0" +version: "3.7.1" description: A modern, C++-native, test framework for unit-tests, TDD and BDD - using C++14, C++17 and later url: https://github.com/espressif/idf-extra-components/tree/master/catch2 repository: https://github.com/espressif/idf-extra-components.git diff --git a/catch2/sbom_catch2.yml b/catch2/sbom_catch2.yml index 437223f365..f5ea902087 100644 --- a/catch2/sbom_catch2.yml +++ b/catch2/sbom_catch2.yml @@ -1,7 +1,7 @@ name: catch2 -version: 3.7.0 +version: 3.7.1 cpe: cpe:2.3:a:catchorg:catch2:{}:*:*:*:*:*:*:* supplier: 'Organization: catchorg ' description: A modern, C++-native, test framework for unit-tests, TDD and BDD - using C++14, C++17 and later url: https://github.com/catchorg/Catch2 -hash: 31588bb4f56b638dd5afc28d3ebff9b9dcefb88d +hash: fa43b77429ba76c462b1898d6cd2f2d7a9416b14