Skip to content

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented May 25, 2021

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 in CI with the cached depends/sources directory).

This is an alternative to #22058.

This change fixes broken Android APK build when the `depends/sources`
directory contains Qt source archives of different versions (e.g., Qt
version update pull request in CI with the cached `depends/sources`
directory).
@hebasto
Copy link
Member Author

hebasto commented May 25, 2021

Android APK build of the #22054 on top of this PR: https://cirrus-ci.com/task/6725312600866816.

@maflcko
Copy link
Member

maflcko commented May 26, 2021

review ACK cb7eba2

@laanwj
Copy link
Member

laanwj commented May 27, 2021

Good catch! This was kind of ugly; I always symlink the sources directory so there is going to be a lot of old versions there. These should not interfere with the build.

Code review ACK cb7eba2

@laanwj laanwj merged commit 22b8452 into bitcoin:master May 27, 2021
@hebasto hebasto deleted the 210525-version branch May 27, 2021 11:51
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request May 27, 2021
… 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#22054) in CI with the cached `depends/sources` directory).

  This is an alternative to bitcoin#22058.

ACKs for top commit:
  MarcoFalke:
    review ACK cb7eba2
  laanwj:
    Code review ACK cb7eba2

Tree-SHA512: cf63a9809fba5cb13719d7e7bb5afc718a2cff5233b0670d30d30a0018d91278fcfc2a1b9ae8b84e8e3a52c95157bc465603cc754bb8a9d1a3d62415f01ad70f
gwillen pushed a commit to ElementsProject/elements that referenced this pull request Jun 1, 2022
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants