highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-05-12 15:03:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#35165: cmake: Remove NetBSD-specific workaround from add_boost_if_needed

Browse Source 
e2ef54b8ba cmake: Remove NetBSD-specific workaround from `add_boost_if_needed` (Hennadii Stepanov)

Pull request description:

  The patched package [`boost-1.90.0`](https://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/boost/index.html) is available as of the [`pkgsrc-2026Q1`](https://mail-index.netbsd.org/netbsd-announce/2026/03/27/msg000392.html) release.

ACKs for top commit:
  davidgumberg:
    Tested ACK e2ef54b8ba
  fanquake:
    ACK e2ef54b8ba

Tree-SHA512: d6c78d874c80daaaaddea93215dab32c254bcdca60d42613105c231c92847b7a049b87e419c764cb58ea3aa456f02ddffc9e94d23bc709f3109f621f909872b6
This commit is contained in:
merge-script
2026-05-02 11:18:45 +01:00
parent b1ff4773ba e2ef54b8ba
commit 8f4a3ba897
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/module/AddBoostIfNeeded.cmake
View File

@@ -31,17 +31,6 @@ function(add_boost_if_needed)
find_package(Boost 1.74.0 REQUIRED CONFIG)
mark_as_advanced(Boost_INCLUDE_DIR boost_headers_DIR)
# Workaround for a bug in NetBSD pkgsrc.
# See https://gnats.netbsd.org/59856.
if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
get_filename_component(_boost_include_dir "${boost_headers_DIR}/../../../include/" ABSOLUTE)
if(_boost_include_dir MATCHES "^/usr/pkg/")
set_target_properties(Boost::headers PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${_boost_include_dir}
)
endif()
unset(_boost_include_dir)
endif()
set_target_properties(Boost::headers PROPERTIES IMPORTED_GLOBAL TRUE)
target_compile_definitions(Boost::headers INTERFACE
# We don't use multi_index serialization.