Skip to content

Conversation

@hebasto
Copy link
Member

@hebasto hebasto commented Dec 5, 2021

#23489 introduced a regression making build for HOST=x86_64-linux-android broken due to the QTBUG-86785.

This PR fixes this regression.

@hebasto
Copy link
Member Author

hebasto commented Dec 5, 2021

cc @icota @fanquake @jarolrod

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK ac9e4bc

bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
f1eba5152b738155174327fbdf89e0c1a79b54ec35e11144b43d64d414615a7e  guix-build-ac9e4bc1e273/output/aarch64-linux-gnu/SHA256SUMS.part
e2542bbe00e83bf1b6c04ec4bdfa30e25336e6e14ee2b7681b020b696878ab9f  guix-build-ac9e4bc1e273/output/aarch64-linux-gnu/bitcoin-ac9e4bc1e273-aarch64-linux-gnu-debug.tar.gz
f806b974bfb8dd85e7af390f432bdd4adf7d396b585c7445d92baba02504848a  guix-build-ac9e4bc1e273/output/aarch64-linux-gnu/bitcoin-ac9e4bc1e273-aarch64-linux-gnu.tar.gz
f6e7d84b08254fa8de7888f7d0850c8f9649023c5b150559acfc82db91d34a1b  guix-build-ac9e4bc1e273/output/arm-linux-gnueabihf/SHA256SUMS.part
3eaa728cb740c1f452c3b5adaf8f453a2d719422065bfda56c4e4cff399ca922  guix-build-ac9e4bc1e273/output/arm-linux-gnueabihf/bitcoin-ac9e4bc1e273-arm-linux-gnueabihf-debug.tar.gz
de411710c24a45fb74d44d650b37e5341a867ee280be7476d119cbf04f924891  guix-build-ac9e4bc1e273/output/arm-linux-gnueabihf/bitcoin-ac9e4bc1e273-arm-linux-gnueabihf.tar.gz
89cfda73c7aa9e8d13894f36b265dd033420203ec9affc80ae9d8ee6a93a3c11  guix-build-ac9e4bc1e273/output/dist-archive/bitcoin-ac9e4bc1e273.tar.gz
be3b9d8e29cfed694e6b516c4ae07c80ce8be5a236eac9a09afe0e46899d54af  guix-build-ac9e4bc1e273/output/powerpc64-linux-gnu/SHA256SUMS.part
5959517bcb55e1a17e79aab34cf49dfac732678813cceaf91f8dbfbda84ae880  guix-build-ac9e4bc1e273/output/powerpc64-linux-gnu/bitcoin-ac9e4bc1e273-powerpc64-linux-gnu-debug.tar.gz
a207d3d6fe93ac26e2076e5f3d51a4c2d09db0602ad6a4421ee586cad5b31cb5  guix-build-ac9e4bc1e273/output/powerpc64-linux-gnu/bitcoin-ac9e4bc1e273-powerpc64-linux-gnu.tar.gz
5a526c792740ac250535411c6460184e1b6524d0f4f9e0b5c43d599af7dc260c  guix-build-ac9e4bc1e273/output/powerpc64le-linux-gnu/SHA256SUMS.part
c160d405a5c7181f97daed91940c93fbfb04fc25a04af248645f9df04a1aa529  guix-build-ac9e4bc1e273/output/powerpc64le-linux-gnu/bitcoin-ac9e4bc1e273-powerpc64le-linux-gnu-debug.tar.gz
9460a4e218950576cc712d9f32c8ac7bba3ddf3934e8f300d45216f8257785d9  guix-build-ac9e4bc1e273/output/powerpc64le-linux-gnu/bitcoin-ac9e4bc1e273-powerpc64le-linux-gnu.tar.gz
e4d9e2fdb39d6774f6eded429969f15f2fde4c58c57d17f9abe45760b1f9a79c  guix-build-ac9e4bc1e273/output/riscv64-linux-gnu/SHA256SUMS.part
b94bcaccb0a4fdf58d04f71fbec42f15f7acb39f6771d50bde3e5bfe373da14e  guix-build-ac9e4bc1e273/output/riscv64-linux-gnu/bitcoin-ac9e4bc1e273-riscv64-linux-gnu-debug.tar.gz
ce48d4e34affe449a4f79b8862de8d72aeaf850295b121d9b786f0d61d9698da  guix-build-ac9e4bc1e273/output/riscv64-linux-gnu/bitcoin-ac9e4bc1e273-riscv64-linux-gnu.tar.gz
5d145076e3aebfa84a7cff7ce4c26e923c786856b200770a124bbcce07336a06  guix-build-ac9e4bc1e273/output/x86_64-apple-darwin19/SHA256SUMS.part
34885df9bf83ede2ab2797af9948f1d974f854d0688d78eefb3cb62c76214395  guix-build-ac9e4bc1e273/output/x86_64-apple-darwin19/bitcoin-ac9e4bc1e273-osx-unsigned.dmg
4d28c8566ff723536dd23df443ebaf2ecb26abcb51ba12c8c73d7a20e86d4796  guix-build-ac9e4bc1e273/output/x86_64-apple-darwin19/bitcoin-ac9e4bc1e273-osx-unsigned.tar.gz
65829d56eafa016db15d5c2e4342f2ba00cb22ac3f8cc10c8432a642ac631722  guix-build-ac9e4bc1e273/output/x86_64-apple-darwin19/bitcoin-ac9e4bc1e273-osx64.tar.gz
f23dc393ae006aec9e97f84fc15efb43fcf3a83ea3344e8591bc21e7a7c9bc05  guix-build-ac9e4bc1e273/output/x86_64-linux-gnu/SHA256SUMS.part
a7ec39fd0a199f5726ff7aaafcf97bb6137068c2033d3ec35e4a3c0f83e35675  guix-build-ac9e4bc1e273/output/x86_64-linux-gnu/bitcoin-ac9e4bc1e273-x86_64-linux-gnu-debug.tar.gz
26ebeab2177f6406e6a9f7319ff35ca0fa820053ef158934960a56d16769170c  guix-build-ac9e4bc1e273/output/x86_64-linux-gnu/bitcoin-ac9e4bc1e273-x86_64-linux-gnu.tar.gz
4078ace9696a57a1641a8ed742c81b1753e98e87d19bc7412a20483ed9593cc2  guix-build-ac9e4bc1e273/output/x86_64-w64-mingw32/SHA256SUMS.part
ab258c8cb0e37c9390a61d809c21dd952d91d6d2f30d60cb218aafcdc231c60f  guix-build-ac9e4bc1e273/output/x86_64-w64-mingw32/bitcoin-ac9e4bc1e273-win-unsigned.tar.gz
1baf50cda22e6016758fcecc4d960b4e2ac23668c50178ee6af25ed92f1f799c  guix-build-ac9e4bc1e273/output/x86_64-w64-mingw32/bitcoin-ac9e4bc1e273-win64-debug.zip
bf3bd2851c65ba97fd20297f5c0daea5675ffe6165cb5f37da68ee06fc001b6e  guix-build-ac9e4bc1e273/output/x86_64-w64-mingw32/bitcoin-ac9e4bc1e273-win64-setup-unsigned.exe
3b58f61cc5f54ff79fe1649f79d54d354c0bd6a936ceb05d02caac6785d175d7  guix-build-ac9e4bc1e273/output/x86_64-w64-mingw32/bitcoin-ac9e4bc1e273-win64.zip

@hebasto
Copy link
Member Author

hebasto commented Dec 7, 2021

Guix builds:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
f1eba5152b738155174327fbdf89e0c1a79b54ec35e11144b43d64d414615a7e  guix-build-ac9e4bc1e273/output/aarch64-linux-gnu/SHA256SUMS.part
e2542bbe00e83bf1b6c04ec4bdfa30e25336e6e14ee2b7681b020b696878ab9f  guix-build-ac9e4bc1e273/output/aarch64-linux-gnu/bitcoin-ac9e4bc1e273-aarch64-linux-gnu-debug.tar.gz
f806b974bfb8dd85e7af390f432bdd4adf7d396b585c7445d92baba02504848a  guix-build-ac9e4bc1e273/output/aarch64-linux-gnu/bitcoin-ac9e4bc1e273-aarch64-linux-gnu.tar.gz
f6e7d84b08254fa8de7888f7d0850c8f9649023c5b150559acfc82db91d34a1b  guix-build-ac9e4bc1e273/output/arm-linux-gnueabihf/SHA256SUMS.part
3eaa728cb740c1f452c3b5adaf8f453a2d719422065bfda56c4e4cff399ca922  guix-build-ac9e4bc1e273/output/arm-linux-gnueabihf/bitcoin-ac9e4bc1e273-arm-linux-gnueabihf-debug.tar.gz
de411710c24a45fb74d44d650b37e5341a867ee280be7476d119cbf04f924891  guix-build-ac9e4bc1e273/output/arm-linux-gnueabihf/bitcoin-ac9e4bc1e273-arm-linux-gnueabihf.tar.gz
89cfda73c7aa9e8d13894f36b265dd033420203ec9affc80ae9d8ee6a93a3c11  guix-build-ac9e4bc1e273/output/dist-archive/bitcoin-ac9e4bc1e273.tar.gz
be3b9d8e29cfed694e6b516c4ae07c80ce8be5a236eac9a09afe0e46899d54af  guix-build-ac9e4bc1e273/output/powerpc64-linux-gnu/SHA256SUMS.part
5959517bcb55e1a17e79aab34cf49dfac732678813cceaf91f8dbfbda84ae880  guix-build-ac9e4bc1e273/output/powerpc64-linux-gnu/bitcoin-ac9e4bc1e273-powerpc64-linux-gnu-debug.tar.gz
a207d3d6fe93ac26e2076e5f3d51a4c2d09db0602ad6a4421ee586cad5b31cb5  guix-build-ac9e4bc1e273/output/powerpc64-linux-gnu/bitcoin-ac9e4bc1e273-powerpc64-linux-gnu.tar.gz
5a526c792740ac250535411c6460184e1b6524d0f4f9e0b5c43d599af7dc260c  guix-build-ac9e4bc1e273/output/powerpc64le-linux-gnu/SHA256SUMS.part
c160d405a5c7181f97daed91940c93fbfb04fc25a04af248645f9df04a1aa529  guix-build-ac9e4bc1e273/output/powerpc64le-linux-gnu/bitcoin-ac9e4bc1e273-powerpc64le-linux-gnu-debug.tar.gz
9460a4e218950576cc712d9f32c8ac7bba3ddf3934e8f300d45216f8257785d9  guix-build-ac9e4bc1e273/output/powerpc64le-linux-gnu/bitcoin-ac9e4bc1e273-powerpc64le-linux-gnu.tar.gz
e4d9e2fdb39d6774f6eded429969f15f2fde4c58c57d17f9abe45760b1f9a79c  guix-build-ac9e4bc1e273/output/riscv64-linux-gnu/SHA256SUMS.part
b94bcaccb0a4fdf58d04f71fbec42f15f7acb39f6771d50bde3e5bfe373da14e  guix-build-ac9e4bc1e273/output/riscv64-linux-gnu/bitcoin-ac9e4bc1e273-riscv64-linux-gnu-debug.tar.gz
ce48d4e34affe449a4f79b8862de8d72aeaf850295b121d9b786f0d61d9698da  guix-build-ac9e4bc1e273/output/riscv64-linux-gnu/bitcoin-ac9e4bc1e273-riscv64-linux-gnu.tar.gz
5d145076e3aebfa84a7cff7ce4c26e923c786856b200770a124bbcce07336a06  guix-build-ac9e4bc1e273/output/x86_64-apple-darwin19/SHA256SUMS.part
34885df9bf83ede2ab2797af9948f1d974f854d0688d78eefb3cb62c76214395  guix-build-ac9e4bc1e273/output/x86_64-apple-darwin19/bitcoin-ac9e4bc1e273-osx-unsigned.dmg
4d28c8566ff723536dd23df443ebaf2ecb26abcb51ba12c8c73d7a20e86d4796  guix-build-ac9e4bc1e273/output/x86_64-apple-darwin19/bitcoin-ac9e4bc1e273-osx-unsigned.tar.gz
65829d56eafa016db15d5c2e4342f2ba00cb22ac3f8cc10c8432a642ac631722  guix-build-ac9e4bc1e273/output/x86_64-apple-darwin19/bitcoin-ac9e4bc1e273-osx64.tar.gz
f23dc393ae006aec9e97f84fc15efb43fcf3a83ea3344e8591bc21e7a7c9bc05  guix-build-ac9e4bc1e273/output/x86_64-linux-gnu/SHA256SUMS.part
a7ec39fd0a199f5726ff7aaafcf97bb6137068c2033d3ec35e4a3c0f83e35675  guix-build-ac9e4bc1e273/output/x86_64-linux-gnu/bitcoin-ac9e4bc1e273-x86_64-linux-gnu-debug.tar.gz
26ebeab2177f6406e6a9f7319ff35ca0fa820053ef158934960a56d16769170c  guix-build-ac9e4bc1e273/output/x86_64-linux-gnu/bitcoin-ac9e4bc1e273-x86_64-linux-gnu.tar.gz
4078ace9696a57a1641a8ed742c81b1753e98e87d19bc7412a20483ed9593cc2  guix-build-ac9e4bc1e273/output/x86_64-w64-mingw32/SHA256SUMS.part
ab258c8cb0e37c9390a61d809c21dd952d91d6d2f30d60cb218aafcdc231c60f  guix-build-ac9e4bc1e273/output/x86_64-w64-mingw32/bitcoin-ac9e4bc1e273-win-unsigned.tar.gz
1baf50cda22e6016758fcecc4d960b4e2ac23668c50178ee6af25ed92f1f799c  guix-build-ac9e4bc1e273/output/x86_64-w64-mingw32/bitcoin-ac9e4bc1e273-win64-debug.zip
bf3bd2851c65ba97fd20297f5c0daea5675ffe6165cb5f37da68ee06fc001b6e  guix-build-ac9e4bc1e273/output/x86_64-w64-mingw32/bitcoin-ac9e4bc1e273-win64-setup-unsigned.exe
3b58f61cc5f54ff79fe1649f79d54d354c0bd6a936ceb05d02caac6785d175d7  guix-build-ac9e4bc1e273/output/x86_64-w64-mingw32/bitcoin-ac9e4bc1e273-win64.zip

@fanquake fanquake merged commit 0d10105 into bitcoin:master Dec 8, 2021
@hebasto hebasto deleted the 211205-android branch December 8, 2021 09:16
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Dec 8, 2021
ac9e4bc build: Fix build for Android x86_64 (Hennadii Stepanov)

Pull request description:

  bitcoin#23489 [introduced](bitcoin#23489 (comment)) a regression making build for `HOST=x86_64-linux-android` broken due to the [QTBUG-86785](https://bugreports.qt.io/browse/QTBUG-86785).

  This PR fixes this regression.

ACKs for top commit:
  fanquake:
    ACK ac9e4bc

Tree-SHA512: c841a56d745c4b4a75e1bc4d89752de153aa6328752a8fd7df614363ed046a291a9eb58605d82fcba21f3c8b0f0bf47786ed0a63c29f81f5d4ad9c0b12304100
RandyMcMillan pushed a commit to RandyMcMillan/mempool-tab that referenced this pull request Dec 23, 2021
8d6d708 build: Fix build for Android x86_64 (Hennadii Stepanov)

Pull request description:

  bitcoin/bitcoin#23489 [introduced](bitcoin/bitcoin#23489 (comment)) a regression making build for `HOST=x86_64-linux-android` broken due to the [QTBUG-86785](https://bugreports.qt.io/browse/QTBUG-86785).

  This PR fixes this regression.

ACKs for top commit:
  fanquake:
    ACK 8d6d708

Tree-SHA512: c841a56d745c4b4a75e1bc4d89752de153aa6328752a8fd7df614363ed046a291a9eb58605d82fcba21f3c8b0f0bf47786ed0a63c29f81f5d4ad9c0b12304100
@bitcoin bitcoin locked and limited conversation to collaborators Dec 8, 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