Skip to content

build: Prevent system header fallback and include path pollution #34143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fanquake merged 4 commits into from
Feb 11, 2026
+12 −3
Merged

build: Prevent system header fallback and include path pollution #34143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d73378f
cmake: Add missed `Boost::headers`
hebasto Jan 21, 2026
b5375c4
depends: Prefix include path for headers-only `boost` package
hebasto Jan 21, 2026
94a692b
cmake: Add missed `USDT::headers`
hebasto Jan 21, 2026
65134c7
depends: Prefix include path for headers-only `systemtap` package
hebasto Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions depends/packages/boost.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ define $(package)_set_vars
$(package)_config_opts += -DBOOST_INSTALL_LAYOUT=system
$(package)_config_opts += -DBUILD_TESTING=OFF
$(package)_config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_ICU=ON
# Install to a unique path to prevent accidental inclusion via other dependencies' -I flags.
$(package)_config_opts += -DCMAKE_INSTALL_INCLUDEDIR=$(package)/include
Copy link
Member Author

@hebasto hebasto Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently, this breaks builds on NetBSD due to a hack introduced in 5a5ddbd.

endef

define $(package)_config_cmds
Expand Down
10 changes: 7 additions & 3 deletions depends/packages/systemtap.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ $(package)_sha256_hash=966a360fb73a4b65a8d0b51b389577b3c4f92a327e84aae58682103e8
$(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch

define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch && \
mkdir -p $($(package)_staging_prefix_dir)/include/sys && \
cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/include/sys/sdt.h
patch -p1 < $($(package)_patch_dir)/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch
endef

# Install to a unique path to prevent accidental inclusion via other dependencies' -I flags.
define $(package)_stage_cmds
mkdir -p $($(package)_staging_prefix_dir)/$(package)/include/sys && \
cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/$(package)/include/sys/sdt.h
endef
1 change: 1 addition & 0 deletions depends/toolchain.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ if("@usdt_packages@" MATCHES "^[ ]*$")
set(WITH_USDT OFF CACHE BOOL "")
else()
set(WITH_USDT ON CACHE BOOL "")
set(USDT_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/systemtap/include" CACHE PATH "")
endif()

set(ipc_packages @ipc_packages@)
Expand Down
1 change: 1 addition & 0 deletions src/ipc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ target_link_libraries(bitcoin_ipc
PRIVATE
core_interface
univalue
Boost::headers
)

if(BUILD_TESTS)
Expand Down
1 change: 1 addition & 0 deletions src/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ target_link_libraries(test_bitcoin
secp256k1
Boost::headers
libevent::extra
$<TARGET_NAME_IF_EXISTS:USDT::headers>
)

if(ENABLE_WALLET)
Expand Down
Loading