Skip to content

Commit 22b8452

Browse files
committed
Merge bitcoin/bitcoin#22063: build: Use Qt archive of the same version as the compiled binaries
cb7eba2 build: Use Qt archive of the same version as the compiled binaries (Hennadii Stepanov) Pull request description: This PR fixes broken Android APK build when the `depends/sources` directory contains Qt source archives of different versions (e.g., Qt version update [pull request](bitcoin/bitcoin#22054) in CI with the cached `depends/sources` directory). This is an alternative to #22058. ACKs for top commit: MarcoFalke: review ACK cb7eba2 laanwj: Code review ACK cb7eba2 Tree-SHA512: cf63a9809fba5cb13719d7e7bb5afc718a2cff5233b0670d30d30a0018d91278fcfc2a1b9ae8b84e8e3a52c95157bc465603cc754bb8a9d1a3d62415f01ad70f
2 parents b789914 + cb7eba2 commit 22b8452

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/Makefile.qt.include

+2-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@ bitcoin_qt_clean: FORCE
382382
bitcoin_qt : qt/bitcoin-qt$(EXEEXT)
383383

384384
APK_LIB_DIR = qt/android/libs/$(ANDROID_ARCH)
385-
QT_BASE_PATH = $(shell find ../depends/sources/ -maxdepth 1 -type f -regex ".*qtbase.*\.tar.xz")
385+
QT_BASE_VERSION = $(lastword $(shell $(MOC) --version))
386+
QT_BASE_PATH = $(shell find ../depends/sources/ -maxdepth 1 -type f -regex ".*qtbase.*$(QT_BASE_VERSION)\.tar.xz")
386387
QT_BASE_TLD = $(shell tar tf $(QT_BASE_PATH) --exclude='*/*')
387388

388389
bitcoin_qt_apk: FORCE

0 commit comments

Comments
 (0)