diff options
| author | W. J. van der Laan <laanwj@protonmail.com> | 2021-05-27 13:42:56 +0200 |
|---|---|---|
| committer | W. J. van der Laan <laanwj@protonmail.com> | 2021-05-27 13:48:56 +0200 |
| commit | 22b845291cdfc29325488c514435288bcc969418 (patch) | |
| tree | 6343927bb60f1640bb070ed1d9f88ae931e5dffd /src | |
| parent | b789914f1723e34966ec4b73292b6345a38a7d46 (diff) | |
| parent | cb7eba2a570e7830d53a21b7d534087c00b4cbd7 (diff) | |
Merge bitcoin/bitcoin#22063: build: Use Qt archive of the same version as the compiled binaries
cb7eba2a570e7830d53a21b7d534087c00b4cbd7 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](https://github.com/bitcoin/bitcoin/pull/22054) in CI with the cached `depends/sources` directory).
This is an alternative to #22058.
ACKs for top commit:
MarcoFalke:
review ACK cb7eba2a570e7830d53a21b7d534087c00b4cbd7
laanwj:
Code review ACK cb7eba2a570e7830d53a21b7d534087c00b4cbd7
Tree-SHA512: cf63a9809fba5cb13719d7e7bb5afc718a2cff5233b0670d30d30a0018d91278fcfc2a1b9ae8b84e8e3a52c95157bc465603cc754bb8a9d1a3d62415f01ad70f
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.qt.include | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 9e471d61da..9ad66bc85b 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -382,7 +382,8 @@ bitcoin_qt_clean: FORCE bitcoin_qt : qt/bitcoin-qt$(EXEEXT) APK_LIB_DIR = qt/android/libs/$(ANDROID_ARCH) -QT_BASE_PATH = $(shell find ../depends/sources/ -maxdepth 1 -type f -regex ".*qtbase.*\.tar.xz") +QT_BASE_VERSION = $(lastword $(shell $(MOC) --version)) +QT_BASE_PATH = $(shell find ../depends/sources/ -maxdepth 1 -type f -regex ".*qtbase.*$(QT_BASE_VERSION)\.tar.xz") QT_BASE_TLD = $(shell tar tf $(QT_BASE_PATH) --exclude='*/*') bitcoin_qt_apk: FORCE |