Skip to content

Commit 89720b7

Browse files
committed
Merge bitcoin/bitcoin#31543: cmake: Always provide RPATH on NetBSD
11115e9 cmake: Always provide `RPATH` on NetBSD (Hennadii Stepanov) Pull request description: Apparently, runtime paths cannot be skipped on NetBSD, even for system-wide packages. On NetBSD 10.0: - on the master branch @ bb57017: ``` $ cmake -B build -DCMAKE_C_COMPILER="/usr/pkg/gcc14/bin/gcc" -DCMAKE_CXX_COMPILER="/usr/pkg/gcc14/bin/g++" $ cmake --build build $ ./build/src/bitcoin-wallet -version ./build/src/bitcoin-wallet: Shared object "libsqlite3.so.0" not found $ cmake --install build --prefix /home/hebasto/INSTALL $ /home/hebasto/INSTALL/bin/bitcoin-wallet -version /home/hebasto/INSTALL/bin/bitcoin-wallet: Shared object "libsqlite3.so.0" not found ``` - with this PR: ``` $ cmake -B build -DCMAKE_C_COMPILER="/usr/pkg/gcc14/bin/gcc" -DCMAKE_CXX_COMPILER="/usr/pkg/gcc14/bin/g++" $ cmake --build build $ ./build/src/bitcoin-wallet -version | head -1 Bitcoin Core bitcoin-wallet utility version v28.99.0-11115e9aa845 $ cmake --install build --prefix /home/hebasto/INSTALL $ /home/hebasto/INSTALL/bin/bitcoin-wallet -version | head -1 Bitcoin Core bitcoin-wallet utility version v28.99.0-11115e9aa845 ``` ACKs for top commit: theuni: utACK bitcoin/bitcoin@11115e9 Tree-SHA512: c9cd5d8c65fcf12677c381060dd53794396b7cd3e61ec39d3c5dadd7cdc08ab9790c59aa346402d53f8f9f317830919edf7f8135a6c0d5703c3bd9e519b157a4
2 parents 5b3a81f + 11115e9 commit 89720b7

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,13 @@ endif()
580580
# Relevant discussions:
581581
# - https://github.com/hebasto/bitcoin/pull/236#issuecomment-2183120953
582582
# - https://github.com/bitcoin/bitcoin/pull/30312#issuecomment-2191235833
583-
set(CMAKE_SKIP_BUILD_RPATH TRUE)
584-
set(CMAKE_SKIP_INSTALL_RPATH TRUE)
583+
# NetBSD always requires runtime paths to be set for executables.
584+
if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
585+
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
586+
else()
587+
set(CMAKE_SKIP_BUILD_RPATH TRUE)
588+
set(CMAKE_SKIP_INSTALL_RPATH TRUE)
589+
endif()
585590
add_subdirectory(test)
586591
add_subdirectory(doc)
587592

0 commit comments

Comments
 (0)