From 8214ef18b703a3e1c6099a9ef1e64a8964e6b52f Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Mon, 22 Apr 2024 05:32:44 +0100
Subject: [PATCH] cmake [KILL 3-STATE]: Switch `WITH_USDT` to boolean w/
 default OFF

---
 CMakeLists.txt             | 10 +++++-----
 cmake/optional.cmake       | 11 -----------
 depends/Makefile           |  2 +-
 depends/toolchain.cmake.in |  6 ++++--
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39144afb97824..7a3966d2c8746 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,11 +96,11 @@ if(WITH_ZMQ)
   endif()
 endif()
 
-tristate_option(WITH_USDT
-  "Enable tracepoints for Userspace, Statically Defined Tracing."
-  "if sys/sdt.h is found."
-  AUTO
-)
+option(WITH_USDT "Enable tracepoints for Userspace, Statically Defined Tracing." OFF)
+if(WITH_USDT)
+  find_package(USDT MODULE REQUIRED)
+endif()
+
 cmake_dependent_option(WITH_EXTERNAL_SIGNER "Enable external signer support." ON "NOT WIN32" OFF)
 set(ENABLE_EXTERNAL_SIGNER ${WITH_EXTERNAL_SIGNER})
 tristate_option(WITH_QRENCODE "Enable QR code support." "if libqrencode is found." AUTO)
diff --git a/cmake/optional.cmake b/cmake/optional.cmake
index c0feb03c698f4..690ab5b145e17 100644
--- a/cmake/optional.cmake
+++ b/cmake/optional.cmake
@@ -50,17 +50,6 @@ if(CCACHE)
   mark_as_advanced(CCACHE_COMMAND)
 endif()
 
-if(WITH_USDT)
-  find_package(USDT MODULE)
-  if(USDT_FOUND)
-    set(WITH_USDT ON)
-  elseif(WITH_USDT STREQUAL "AUTO")
-    set(WITH_USDT OFF)
-  else()
-    message(FATAL_ERROR "sys/sdt.h requested, but not found.")
-  endif()
-endif()
-
 if(ENABLE_WALLET)
   if(WITH_SQLITE)
     if(VCPKG_TARGET_TRIPLET)
diff --git a/depends/Makefile b/depends/Makefile
index 50825d8d5d9f3..46d01f61fecc0 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -293,7 +293,7 @@ $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(fina
             -e 's|@no_sqlite@|$(NO_SQLITE)|' \
             -e 's|@no_upnp@|$(NO_UPNP)|' \
             -e 's|@no_natpmp@|$(NO_NATPMP)|' \
-            -e 's|@no_usdt@|$(NO_USDT)|' \
+            -e 's|@no_usdt@|$(NO_USDT)|' -e 's|@usdt_packages@|$(usdt_packages_)|' \
             -e 's|@no_harden@|$(NO_HARDEN)|' \
             -e 's|@multiprocess@|$(MULTIPROCESS)|' \
             $< > $@
diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in
index 3ccaf8fdf0c78..f752d29e3b6c2 100644
--- a/depends/toolchain.cmake.in
+++ b/depends/toolchain.cmake.in
@@ -152,8 +152,10 @@ else()
   set(WITH_NATPMP ON CACHE BOOL "")
 endif()
 
-if(NOT WITH_USDT AND "@no_usdt@" STREQUAL "1")
-  set(WITH_USDT OFF CACHE STRING "Enable tracepoints for Userspace, Statically Defined Tracing.")
+if("@no_usdt@" OR NOT "@usdt_packages@")
+  set(WITH_USDT OFF CACHE BOOL "")
+else()
+  set(WITH_USDT ON CACHE BOOL "")
 endif()
 
 if("@no_harden@")