Skip to content

Commit e57cfea

Browse files
committed
no-rpath in qt dependency
1 parent 3da0ed8 commit e57cfea

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

depends/packages/qt.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ $(package)_config_opts += -no-openssl
6363
$(package)_config_opts += -no-openvg
6464
$(package)_config_opts += -no-pkg-config
6565
$(package)_config_opts += -no-reduce-relocations
66+
$(package)_config_opts += -no-rpath
6667
$(package)_config_opts += -no-schannel
6768
$(package)_config_opts += -no-sctp
6869
$(package)_config_opts += -no-securetransport

src/qt/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,11 @@ add_executable(elements-qt
227227
../init/bitcoin-qt.cpp
228228
)
229229

230-
set_target_properties(elements-qt PROPERTIES
231-
SKIP_BUILD_RPATH OFF
232-
)
230+
if(APPLE)
231+
set_target_properties(elements-qt PROPERTIES
232+
SKIP_BUILD_RPATH OFF
233+
)
234+
endif()
233235

234236
add_windows_resources(elements-qt res/bitcoin-qt-res.rc)
235237

test/functional/test_framework/mempool_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def fill_mempool(test_framework, node, *, tx_sync_fun=None):
5454
minrelayfee = node.getnetworkinfo()['relayfee']
5555

5656
tx_batch_size = 1
57-
num_of_batches = 74
57+
num_of_batches = 73
5858
# Generate UTXOs to flood the mempool
5959
# 1 to create a tx initially that will be evicted from the mempool later
6060
# 74 transactions each with a fee rate higher than the previous one

0 commit comments

Comments
 (0)