From e57cfea27256895b892cf36f4eddb98483e59951 Mon Sep 17 00:00:00 2001 From: Tom Trevethan Date: Wed, 29 Jul 2026 13:43:47 +0100 Subject: [PATCH] no-rpath in qt dependency --- depends/packages/qt.mk | 1 + src/qt/CMakeLists.txt | 8 +++++--- test/functional/test_framework/mempool_util.py | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index abd8a6fa8d..b12841471b 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -63,6 +63,7 @@ $(package)_config_opts += -no-openssl $(package)_config_opts += -no-openvg $(package)_config_opts += -no-pkg-config $(package)_config_opts += -no-reduce-relocations +$(package)_config_opts += -no-rpath $(package)_config_opts += -no-schannel $(package)_config_opts += -no-sctp $(package)_config_opts += -no-securetransport diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt index d7b63c0b43..d4572d0c84 100644 --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -227,9 +227,11 @@ add_executable(elements-qt ../init/bitcoin-qt.cpp ) -set_target_properties(elements-qt PROPERTIES - SKIP_BUILD_RPATH OFF -) +if(APPLE) + set_target_properties(elements-qt PROPERTIES + SKIP_BUILD_RPATH OFF + ) +endif() add_windows_resources(elements-qt res/bitcoin-qt-res.rc) diff --git a/test/functional/test_framework/mempool_util.py b/test/functional/test_framework/mempool_util.py index 484669f36c..309890b9c3 100644 --- a/test/functional/test_framework/mempool_util.py +++ b/test/functional/test_framework/mempool_util.py @@ -54,7 +54,7 @@ def fill_mempool(test_framework, node, *, tx_sync_fun=None): minrelayfee = node.getnetworkinfo()['relayfee'] tx_batch_size = 1 - num_of_batches = 74 + num_of_batches = 73 # Generate UTXOs to flood the mempool # 1 to create a tx initially that will be evicted from the mempool later # 74 transactions each with a fee rate higher than the previous one