From cc360444105f817e1f369f1e1bd14bdf55df4a76 Mon Sep 17 00:00:00 2001
From: flipflip <flipflip@fixposition.com>
Date: Wed, 5 Aug 2026 18:38:17 +0200
Subject: [PATCH] simplify boost::stacktrace dependencies

---
 docker/ci.sh                |  4 ++--
 fpsdk_common/CMakeLists.txt | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docker/ci.sh b/docker/ci.sh
index a1459fd..c65df6e 100755
--- a/docker/ci.sh
+++ b/docker/ci.sh
@@ -555,9 +555,9 @@ do_step build_projs_release_noros_mindeps      || true # continue
 
 do_step build_examples                 || true # continue
 
-# Some minimal checks with clang on the reference system (Trixie) and a more recent Ubuntu 26 (= ROS2 Lyrical)
+# Not on Noetic/Ubuntu 20, that is just way too ancient...
 echo "===== clang ====="
-if [ "${FPSDK_IMAGE%-*}" = "trixie" -o "${FPSDK_IMAGE%-*}" = "lyrical" ]; then
+if [ "${FPSDK_IMAGE%-*}" = "trixie" -o "${FPSDK_IMAGE%-*}" = "humble" -o "${FPSDK_IMAGE%-*}" = "jazzy" -o "${FPSDK_IMAGE%-*}" = "lyrical" ]; then
     do_step build_toplevel_release_clang  || true # continue
     do_step build_toplevel_debug_clang    || true # continue
 fi
diff --git a/fpsdk_common/CMakeLists.txt b/fpsdk_common/CMakeLists.txt
index bd3020a..47998b3 100644
--- a/fpsdk_common/CMakeLists.txt
+++ b/fpsdk_common/CMakeLists.txt
@@ -28,8 +28,9 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     add_compile_definitions(NDEBUG)
 endif()
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
-    add_compile_definitions(BOOST_STACKTRACE_USE_BACKTRACE)
-    add_compile_definitions(BOOST_STACKTRACE_USE_ADDR2LINE)
+    #add_compile_definitions(BOOST_STACKTRACE_USE_BACKTRACE)
+    #add_compile_definitions(BOOST_STACKTRACE_USE_ADDR2LINE)
+    add_compile_definitions(BOOST_STACKTRACE_DYN_LINK)
     set(FPSDK_BOOST_STACKTRACE 1)
 endif()
 
@@ -38,11 +39,11 @@ endif()
 
 if(FPSDK_BOOST_STACKTRACE)
     if(FPSDK_LEGACY_BOOST_CMAKE) # e.g. Buildroot 2022.08
-        find_package(Boost REQUIRED COMPONENTS stacktrace_basic stacktrace_backtrace stacktrace_addr2line)
+        find_package(Boost REQUIRED COMPONENTS stacktrace_backtrace)
     else()
-        find_package(Boost CONFIG REQUIRED COMPONENTS stacktrace_basic stacktrace_backtrace stacktrace_addr2line)
+        find_package(Boost CONFIG REQUIRED COMPONENTS stacktrace_backtrace)
     endif()
-    set(Boost_TARGETS "Boost::headers;Boost::stacktrace_basic;Boost::stacktrace_backtrace;Boost::stacktrace_addr2line")
+    set(Boost_TARGETS "Boost::headers;Boost::stacktrace_backtrace")
 else()
     if(FPSDK_LEGACY_BOOST_CMAKE)
         find_package(Boost REQUIRED)