Skip to content

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Jul 16, 2021

This is required to support std::filesystem on Android (see #20744).

Fixes #22074.

@fanquake
Copy link
Member

Concept ACK - Thanks for looking into this, and the patching looks reasonable. As I said in #22074:

I can't imagine we are going to block migrating to std::filesystem based on our Qt version being too old, to support building against a new enough version of the Android NDK to support std::filesystem. I'd rather just drop the Android build until we've moved on to a newer version of Qt.

So if this is a solution for that 👍

@hebasto
Copy link
Member Author

hebasto commented Jul 16, 2021

cc @icota

@DrahtBot
Copy link
Contributor

DrahtBot commented Jul 16, 2021

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

No conflicts as of last run.

@hebasto
Copy link
Member Author

hebasto commented Jul 17, 2021

Updated 4d7fa17 -> 464c46d (pr22469.01 -> pr22469.02, diff).

Addressed @icota's comment:

+= operator here unlike = in other TARGET_ARCHES above?

@icota
Copy link
Contributor

icota commented Jul 17, 2021

tACK 464c46d
Built on CI, APK works fine on a device. Thanks @hebasto!

@hebasto
Copy link
Member Author

hebasto commented Jul 18, 2021

Updated 464c46d -> acaac6e (pr22469.02 -> pr22469.03):

@BlockMechanic
Copy link
Contributor

Nice ! This is a much needed change, will test on 23 to see if it works as well

@icota
Copy link
Contributor

icota commented Jul 18, 2021

re-tACK acaac6e

@DrahtBot
Copy link
Contributor

Guix builds

File commit f8b20fd
(master)
commit 6056dd8
(master and this pull)
SHA256SUMS.part 96c2bb7ba54b7408... cad2a160c3861735...
SKIPATTEST.TAG e3b0c44298fc1c14... e3b0c44298fc1c14...
*-aarch64-linux-gnu-debug.tar.gz 430b7413ad482fbe... 11717e3a7775114d...
*-aarch64-linux-gnu.tar.gz a04c19798ce17697... e6be323953d34b21...
*-arm-linux-gnueabihf-debug.tar.gz d33c2611ab3de12a... 58816f225d441762...
*-arm-linux-gnueabihf.tar.gz 1dc7a20a39b89157... 58df776b28a77324...
*-osx-unsigned.dmg ba69ab8697073166... f92a575441bea8f6...
*-osx-unsigned.tar.gz 2c4c6cbf1ba78065... e7cb8b102968ef65...
*-osx64.tar.gz d3a1fe1847bd60fb... b6e443d8dda0f99d...
*-powerpc64-linux-gnu-debug.tar.gz 525e74e6740784b0... 5140fe91db24dd4f...
*-powerpc64-linux-gnu.tar.gz fcd955073397e310... 79457ec5d993c016...
*-powerpc64le-linux-gnu-debug.tar.gz 21f5feab0230ea5c... c1209854efd88c58...
*-powerpc64le-linux-gnu.tar.gz 5e031c8cd5f7ac8c... 36c36906f247e8db...
*-riscv64-linux-gnu-debug.tar.gz ba73dc2f20012393... f72ad2f62e77a6c8...
*-riscv64-linux-gnu.tar.gz 4453462ef92e973a... 5533c2705a2d876c...
*-win-unsigned.tar.gz 4ba62a381fe43c35... f59df79fac7e23ff...
*-win64-debug.zip cab5a691225ff4df... 52c4e6e03032097b...
*-win64-setup-unsigned.exe c7434ae8e3304fcf... 1db73b1d78952a09...
*-win64.zip 1b349d82450c0106... d980eb25e0945ac7...
*-x86_64-linux-gnu-debug.tar.gz a7ed389bbb87ea7c... eee2d6c8c27c7f40...
*-x86_64-linux-gnu.tar.gz 55dcb3a950420126... c834fd963b6e5b08...
*.tar.gz 498a411085ce402b... e4bc1cc6265cf513...
guix_build.log e64cba4d240ee6e8... 2ae02cee12a24e8b...
guix_build.log.diff cb84ca0733736abe...

@fanquake
Copy link
Member

Guix builds:

d38cd187f6ed1e7a9864c4f140589a1e7ea4f48d7928c96de98583f9b6f1b2a7  guix-build-acaac6e86a9e/output/aarch64-linux-gnu/SHA256SUMS.part
921c3615fc2e5acbc5a035bf6f2e24a0f70a5714ec1d80515c77436e1b5ff61d  guix-build-acaac6e86a9e/output/aarch64-linux-gnu/bitcoin-acaac6e86a9e-aarch64-linux-gnu-debug.tar.gz
19cf6afd7f3e37d63584d38b3abac6a3a958264f310793fc10076af184577874  guix-build-acaac6e86a9e/output/aarch64-linux-gnu/bitcoin-acaac6e86a9e-aarch64-linux-gnu.tar.gz
8dd20df0726a79c61ce1f4f57479dc0ed62919409c738d1ccdd36e411bf78102  guix-build-acaac6e86a9e/output/arm-linux-gnueabihf/SHA256SUMS.part
5d2c56cf68f035a46ecece92e7d9bbfa5e35b68c6589fba149542e474adb7509  guix-build-acaac6e86a9e/output/arm-linux-gnueabihf/bitcoin-acaac6e86a9e-arm-linux-gnueabihf-debug.tar.gz
90e381a9ca1b3bed35f09d91fdc99ce0bfbafd3ba888c514ee1d82be92884f37  guix-build-acaac6e86a9e/output/arm-linux-gnueabihf/bitcoin-acaac6e86a9e-arm-linux-gnueabihf.tar.gz
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-acaac6e86a9e/output/dist-archive/SKIPATTEST.TAG
a70163b13242361b0c74e8341e2a7148bde92407f6c45edf784c4598b05daa09  guix-build-acaac6e86a9e/output/dist-archive/bitcoin-acaac6e86a9e.tar.gz
f3c256dff1d89afb1dbf6b9ea61d51eb867a07ec452da30c88508685c4736b75  guix-build-acaac6e86a9e/output/powerpc64-linux-gnu/SHA256SUMS.part
e1fc374fd751ce7339ef1e2d4adcd55704aa2d84fab4e954eea9b6dcf258663c  guix-build-acaac6e86a9e/output/powerpc64-linux-gnu/bitcoin-acaac6e86a9e-powerpc64-linux-gnu-debug.tar.gz
f3b87be252488a6464d18e01d5cb75e83b1f11f9413f744da6297c0c474a333e  guix-build-acaac6e86a9e/output/powerpc64-linux-gnu/bitcoin-acaac6e86a9e-powerpc64-linux-gnu.tar.gz
191d88ca173730cabd2a2218e87306697e92f0ccb5b279d1d2cc5f1f7ac16c97  guix-build-acaac6e86a9e/output/powerpc64le-linux-gnu/SHA256SUMS.part
bf52b6dc51cdbbcaae6a9d9f6e397612520e8ba211cd779856f5e85e6d7e65ff  guix-build-acaac6e86a9e/output/powerpc64le-linux-gnu/bitcoin-acaac6e86a9e-powerpc64le-linux-gnu-debug.tar.gz
9f4740eb595ebf2263a526915e28eaf2c9ee16f5ce4b1cc8894fa6ac22f35647  guix-build-acaac6e86a9e/output/powerpc64le-linux-gnu/bitcoin-acaac6e86a9e-powerpc64le-linux-gnu.tar.gz
0c5397923650ac212b314370318ed67843f65f4b8e2b16f50c23a777f4d33d62  guix-build-acaac6e86a9e/output/riscv64-linux-gnu/SHA256SUMS.part
7f975c1c9b4d2e7944a85c8cacc34c328859812ba6e68bfdb05f507fc4962603  guix-build-acaac6e86a9e/output/riscv64-linux-gnu/bitcoin-acaac6e86a9e-riscv64-linux-gnu-debug.tar.gz
ea2751fc2f60539dfa3329ba859401d97a040e2c1f42eb93cfa64757d110a3c8  guix-build-acaac6e86a9e/output/riscv64-linux-gnu/bitcoin-acaac6e86a9e-riscv64-linux-gnu.tar.gz
a8001e596f1050a89ed0965fba738b4d72c48262dfa4f0649eb85c75d6ea992a  guix-build-acaac6e86a9e/output/x86_64-apple-darwin18/SHA256SUMS.part
55f8b10c4f909402b5ae0f7d976a521ca4311f971262e81fc2a862c2c2ef6411  guix-build-acaac6e86a9e/output/x86_64-apple-darwin18/bitcoin-acaac6e86a9e-osx-unsigned.dmg
a30aa30be3f34bfde9e7fec556c910cfc66b124608c9ed35cbc139a9e99be35e  guix-build-acaac6e86a9e/output/x86_64-apple-darwin18/bitcoin-acaac6e86a9e-osx-unsigned.tar.gz
4fdee4745af8a2a7d6f52e8ad9fe1b6809f0c5a02f0dcfd0432eb807a205e536  guix-build-acaac6e86a9e/output/x86_64-apple-darwin18/bitcoin-acaac6e86a9e-osx64.tar.gz
415994004fb9b8f70e73927324e72e899050cdb74ad5d377daa725844aa5287c  guix-build-acaac6e86a9e/output/x86_64-linux-gnu/SHA256SUMS.part
67aab9cdd3608135c33ab3f9801ee9b1e554229cfdd692c0664c6f06f52e55ba  guix-build-acaac6e86a9e/output/x86_64-linux-gnu/bitcoin-acaac6e86a9e-x86_64-linux-gnu-debug.tar.gz
c9f7f0465cfd12ae2a74b7734008b6a0a56b5be4392e694bc958a0c2671153bf  guix-build-acaac6e86a9e/output/x86_64-linux-gnu/bitcoin-acaac6e86a9e-x86_64-linux-gnu.tar.gz
34acf28dbdd450fc3ae969e38874cc99557dd72a1ee54291d88e81a95b1fe58a  guix-build-acaac6e86a9e/output/x86_64-w64-mingw32/SHA256SUMS.part
f8d7f4ecbee65750ff60b8093acf868c5246251fd6897f7e8a4b310285b535f4  guix-build-acaac6e86a9e/output/x86_64-w64-mingw32/bitcoin-acaac6e86a9e-win-unsigned.tar.gz
c411cf9d1ef1a9e02df4fc2306cfb1dd40324205f84f5c860cbf849703ab9d23  guix-build-acaac6e86a9e/output/x86_64-w64-mingw32/bitcoin-acaac6e86a9e-win64-debug.zip
cdb7d1422a6986329f06e1fd64ecfce751e5a892f4c5b316fc15ff4f2655623c  guix-build-acaac6e86a9e/output/x86_64-w64-mingw32/bitcoin-acaac6e86a9e-win64-setup-unsigned.exe
9dd9696f85f91f5970e76d0d65bb929769c601dfdc1505a2b89a92909c1bc724  guix-build-acaac6e86a9e/output/x86_64-w64-mingw32/bitcoin-acaac6e86a9e-win64.zip

fanquake added a commit to bitcoin-core/gui that referenced this pull request Jul 21, 2021
acaac6e ci: Bump Android NDK to r22 which supports std::filesystem (Hennadii Stepanov)
cac7890 build: Add support for Android NDK r22+ (Hennadii Stepanov)

Pull request description:

  This is required to support [`std::filesystem`](https://github.com/android/ndk/wiki/Changelog-r22#changes) on Android (see #20744).

  Fixes #22074.

ACKs for top commit:
  icota:
    re-tACK bitcoin/bitcoin@acaac6e

Tree-SHA512: ecbec374ee590c4cb30012210f1422d469e7e8b68989f9eb53d36b5feee150d31e6bd10e1fc4a2056fbf4f8f8513e435b446e5feaf21a3a4d09dfc561fb22e73
@fanquake fanquake closed this Jul 21, 2021
@hebasto hebasto deleted the 210716-ndk branch July 21, 2021 07:59
@hebasto
Copy link
Member Author

hebasto commented Jul 21, 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
d38cd187f6ed1e7a9864c4f140589a1e7ea4f48d7928c96de98583f9b6f1b2a7  guix-build-acaac6e86a9e/output/aarch64-linux-gnu/SHA256SUMS.part
921c3615fc2e5acbc5a035bf6f2e24a0f70a5714ec1d80515c77436e1b5ff61d  guix-build-acaac6e86a9e/output/aarch64-linux-gnu/bitcoin-acaac6e86a9e-aarch64-linux-gnu-debug.tar.gz
19cf6afd7f3e37d63584d38b3abac6a3a958264f310793fc10076af184577874  guix-build-acaac6e86a9e/output/aarch64-linux-gnu/bitcoin-acaac6e86a9e-aarch64-linux-gnu.tar.gz
8dd20df0726a79c61ce1f4f57479dc0ed62919409c738d1ccdd36e411bf78102  guix-build-acaac6e86a9e/output/arm-linux-gnueabihf/SHA256SUMS.part
5d2c56cf68f035a46ecece92e7d9bbfa5e35b68c6589fba149542e474adb7509  guix-build-acaac6e86a9e/output/arm-linux-gnueabihf/bitcoin-acaac6e86a9e-arm-linux-gnueabihf-debug.tar.gz
90e381a9ca1b3bed35f09d91fdc99ce0bfbafd3ba888c514ee1d82be92884f37  guix-build-acaac6e86a9e/output/arm-linux-gnueabihf/bitcoin-acaac6e86a9e-arm-linux-gnueabihf.tar.gz
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-acaac6e86a9e/output/dist-archive/SKIPATTEST.TAG
a70163b13242361b0c74e8341e2a7148bde92407f6c45edf784c4598b05daa09  guix-build-acaac6e86a9e/output/dist-archive/bitcoin-acaac6e86a9e.tar.gz
f3c256dff1d89afb1dbf6b9ea61d51eb867a07ec452da30c88508685c4736b75  guix-build-acaac6e86a9e/output/powerpc64-linux-gnu/SHA256SUMS.part
e1fc374fd751ce7339ef1e2d4adcd55704aa2d84fab4e954eea9b6dcf258663c  guix-build-acaac6e86a9e/output/powerpc64-linux-gnu/bitcoin-acaac6e86a9e-powerpc64-linux-gnu-debug.tar.gz
f3b87be252488a6464d18e01d5cb75e83b1f11f9413f744da6297c0c474a333e  guix-build-acaac6e86a9e/output/powerpc64-linux-gnu/bitcoin-acaac6e86a9e-powerpc64-linux-gnu.tar.gz
191d88ca173730cabd2a2218e87306697e92f0ccb5b279d1d2cc5f1f7ac16c97  guix-build-acaac6e86a9e/output/powerpc64le-linux-gnu/SHA256SUMS.part
bf52b6dc51cdbbcaae6a9d9f6e397612520e8ba211cd779856f5e85e6d7e65ff  guix-build-acaac6e86a9e/output/powerpc64le-linux-gnu/bitcoin-acaac6e86a9e-powerpc64le-linux-gnu-debug.tar.gz
9f4740eb595ebf2263a526915e28eaf2c9ee16f5ce4b1cc8894fa6ac22f35647  guix-build-acaac6e86a9e/output/powerpc64le-linux-gnu/bitcoin-acaac6e86a9e-powerpc64le-linux-gnu.tar.gz
0c5397923650ac212b314370318ed67843f65f4b8e2b16f50c23a777f4d33d62  guix-build-acaac6e86a9e/output/riscv64-linux-gnu/SHA256SUMS.part
7f975c1c9b4d2e7944a85c8cacc34c328859812ba6e68bfdb05f507fc4962603  guix-build-acaac6e86a9e/output/riscv64-linux-gnu/bitcoin-acaac6e86a9e-riscv64-linux-gnu-debug.tar.gz
ea2751fc2f60539dfa3329ba859401d97a040e2c1f42eb93cfa64757d110a3c8  guix-build-acaac6e86a9e/output/riscv64-linux-gnu/bitcoin-acaac6e86a9e-riscv64-linux-gnu.tar.gz
a8001e596f1050a89ed0965fba738b4d72c48262dfa4f0649eb85c75d6ea992a  guix-build-acaac6e86a9e/output/x86_64-apple-darwin18/SHA256SUMS.part
55f8b10c4f909402b5ae0f7d976a521ca4311f971262e81fc2a862c2c2ef6411  guix-build-acaac6e86a9e/output/x86_64-apple-darwin18/bitcoin-acaac6e86a9e-osx-unsigned.dmg
a30aa30be3f34bfde9e7fec556c910cfc66b124608c9ed35cbc139a9e99be35e  guix-build-acaac6e86a9e/output/x86_64-apple-darwin18/bitcoin-acaac6e86a9e-osx-unsigned.tar.gz
4fdee4745af8a2a7d6f52e8ad9fe1b6809f0c5a02f0dcfd0432eb807a205e536  guix-build-acaac6e86a9e/output/x86_64-apple-darwin18/bitcoin-acaac6e86a9e-osx64.tar.gz
415994004fb9b8f70e73927324e72e899050cdb74ad5d377daa725844aa5287c  guix-build-acaac6e86a9e/output/x86_64-linux-gnu/SHA256SUMS.part
67aab9cdd3608135c33ab3f9801ee9b1e554229cfdd692c0664c6f06f52e55ba  guix-build-acaac6e86a9e/output/x86_64-linux-gnu/bitcoin-acaac6e86a9e-x86_64-linux-gnu-debug.tar.gz
c9f7f0465cfd12ae2a74b7734008b6a0a56b5be4392e694bc958a0c2671153bf  guix-build-acaac6e86a9e/output/x86_64-linux-gnu/bitcoin-acaac6e86a9e-x86_64-linux-gnu.tar.gz
34acf28dbdd450fc3ae969e38874cc99557dd72a1ee54291d88e81a95b1fe58a  guix-build-acaac6e86a9e/output/x86_64-w64-mingw32/SHA256SUMS.part
f8d7f4ecbee65750ff60b8093acf868c5246251fd6897f7e8a4b310285b535f4  guix-build-acaac6e86a9e/output/x86_64-w64-mingw32/bitcoin-acaac6e86a9e-win-unsigned.tar.gz
c411cf9d1ef1a9e02df4fc2306cfb1dd40324205f84f5c860cbf849703ab9d23  guix-build-acaac6e86a9e/output/x86_64-w64-mingw32/bitcoin-acaac6e86a9e-win64-debug.zip
cdb7d1422a6986329f06e1fd64ecfce751e5a892f4c5b316fc15ff4f2655623c  guix-build-acaac6e86a9e/output/x86_64-w64-mingw32/bitcoin-acaac6e86a9e-win64-setup-unsigned.exe
9dd9696f85f91f5970e76d0d65bb929769c601dfdc1505a2b89a92909c1bc724  guix-build-acaac6e86a9e/output/x86_64-w64-mingw32/bitcoin-acaac6e86a9e-win64.zip

@DrahtBot
Copy link
Contributor

Guix builds

File commit 54e3174
(master)
commit 6755984
(master and this pull)
SHA256SUMS.part 4618fefa61ffe8f6... 0cbca0bd9d4a6e75...
SKIPATTEST.TAG e3b0c44298fc1c14... e3b0c44298fc1c14...
*-aarch64-linux-gnu-debug.tar.gz c73620e84b87b87f... 9954afc56c14abe4...
*-aarch64-linux-gnu.tar.gz dcab4b52d421a87e... 8767c77748d915a1...
*-arm-linux-gnueabihf-debug.tar.gz c14a2c526a1ace3b... 735a04c4a3759aeb...
*-arm-linux-gnueabihf.tar.gz bbcca24a47ed4b3d... cea9c120b9cd8307...
*-osx-unsigned.dmg cb40b1960e8696fb... 9289e1ab00934eae...
*-osx-unsigned.tar.gz 3a91a41bddc7c028... a5818ccc6f2f2b8f...
*-osx64.tar.gz 2bef5f23f710ae9a... cf847e5b00b90f56...
*-powerpc64-linux-gnu-debug.tar.gz d6d4349e5adcb75e... 9cbc10938348564c...
*-powerpc64-linux-gnu.tar.gz a1a270ed4971df4c... 4f16dd9642a5bb33...
*-powerpc64le-linux-gnu-debug.tar.gz 13c01280a3334b5b... 50c9a85821f2a3f1...
*-powerpc64le-linux-gnu.tar.gz e831f4ac4fa7f2fe... dc1f3202e88a6e36...
*-riscv64-linux-gnu-debug.tar.gz 8ac4565c384c9dc2... f6620d715546ab5d...
*-riscv64-linux-gnu.tar.gz 55df2073d987d3c8... 96b44f0caa9fb246...
*-win-unsigned.tar.gz 3fc26d4401638bac... f0f53d01c518838c...
*-win64-debug.zip 3e21ef84bfe717de... c48c77feb0fbdb87...
*-win64-setup-unsigned.exe 807be67297a1db80... 7f19c278da734826...
*-win64.zip 628852f9a940e881... 25483e78454f59ce...
*-x86_64-linux-gnu-debug.tar.gz 6b3739be11914f0b... 2d522fc640358142...
*-x86_64-linux-gnu.tar.gz da780d47aa0acf63... 66e4a5508715204b...
*.tar.gz 9ca7e16f2f340545... fdadea7c04e44509...
guix_build.log f50cba49ca5a04b6... d6494a9240bfc737...
guix_build.log.diff f454f571264bbae8...

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jul 23, 2021
acaac6e ci: Bump Android NDK to r22 which supports std::filesystem (Hennadii Stepanov)
cac7890 build: Add support for Android NDK r22+ (Hennadii Stepanov)

Pull request description:

  This is required to support [`std::filesystem`](https://github.com/android/ndk/wiki/Changelog-r22#changes) on Android (see bitcoin#20744).

  Fixes bitcoin#22074.

ACKs for top commit:
  icota:
    re-tACK bitcoin@acaac6e

Tree-SHA512: ecbec374ee590c4cb30012210f1422d469e7e8b68989f9eb53d36b5feee150d31e6bd10e1fc4a2056fbf4f8f8513e435b446e5feaf21a3a4d09dfc561fb22e73
@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.

depends: qt build for HOST=aarch64-linux-android is broken for NDK 22+
6 participants