diff options
| author | fanquake <fanquake@gmail.com> | 2020-08-24 21:27:19 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-08-24 21:27:29 +0800 |
| commit | 7ce7f2b2518cfa3bd4102c5b443278379bbf24eb (patch) | |
| tree | 9f392f074a42aa727931a0c510c4f5b89101fc41 /src/init.cpp | |
| parent | 8e94275f863cbb4a7db1efd7201c039f355c87c1 (diff) | |
| parent | 366913e307d2dc13bc00d6bf7b6b2426c359ac30 (diff) | |
| download | bitcoin-7ce7f2b2518cfa3bd4102c5b443278379bbf24eb.tar.xz | |
Merge #17396: build: modest Android improvements
366913e307d2dc13bc00d6bf7b6b2426c359ac30 build: AX_BOOST_THREAD serial 33 (Igor Cota)
cf0681133ae7301ead7091eaee55c945da5cdfcc build: disable D-Bus on Android by default (Igor Cota)
Pull request description:
I've been trying to build for Android on different OSes/Gitian with varying success. Build system is quite the beast and sometimes it doesn't get it right. To make sure it does these three little tweaks make the Android build more robust:
- disable D-Bus (Android doesn't support it and has its own way to trigger notifications)
- don't flag `-lpthread` when linking Boost, [Bionic has built-in support](https://stackoverflow.com/questions/30801752/android-ndk-and-pthread)
- ~~add `-static-libstdc++` to linker flags. This avoids having to bundle `libc++_shared` with CLI apps, still necessary with `bitcoin-qt` though (thanks Sjors)~~
I think these are small and fairly straightforward so I put them all into this one PR.
ACKs for top commit:
fanquake:
ACK 366913e307d2dc13bc00d6bf7b6b2426c359ac30
Tree-SHA512: 31465fd228a5877c20aa2a05f98242d4eeb328b9b35bd1a7a3dcfb1ef51379d84053a81ade5a65436ffc1bc8ccd21f11ed0539eb10e827d182c0c04394629af0
Diffstat (limited to 'src/init.cpp')
0 files changed, 0 insertions, 0 deletions