Add depends 32-bit arm support for bitcoin-qt #13604

sedited · 2018-07-06T14:38:20Z

Some hobbyists are used to using the desktop for interfacing with their raspberry pi. This commits adds qt to the arm-linux-gnueabihf target.

Sjors

Concept ACK. Not just Raspberry Pi, also various clones via Armbian.

Fixes the 32-bit part of #13495.

Sjors · 2018-07-06T15:20:11Z

depends/packages/packages.mk

What's the role of $(qt_packages), especially given that qt_i686_linux_packages doesn't have it?

Good findings. I could remove all these changes (I had them in while I was debugging things) and it still seems to run fine. Can you re-run a gitian with b86d49f ?

Sjors · 2018-07-06T15:20:33Z

depends/packages/qt.mk

For future reference: what's wrong with system-zlib?

Sjors · 2018-07-06T15:20:51Z

depends/packages/qt.mk

Should this go away?

sedited · 2018-07-06T15:32:08Z

The Travis job times out with this change. Not sure how to get it to run through.

Sjors · 2018-07-06T17:55:55Z

I restarted the Travis job, but that doesn't seem to help much.

Sjors · 2018-07-07T12:37:26Z

I'm able to build a binary using Armbian: Sjors/armbian-bitcoin-core#1

However, when I launch QT on an Orange Pi I get:

bitcoin-qt: /lib/arm-linux-gnueabihf/libm.so.6: version `GLIB_2.27` not found (required by bitcoin-qt)

This might be because I compiled on Bionic and the target machine uses Xenial*, with libc6 version 2.23

I'll try again with an Armbian on a Ubuntu 16.04 VM.

= because desktop support still doesn't work for that device with Bionic

sedited · 2018-07-07T12:58:43Z

Alternatively you could also apply #13177 and test if it also works for arm.

Sjors · 2018-07-07T13:29:08Z

Cherry-picking that branch did the trick, nice!

Sjors · 2018-07-07T15:06:01Z

I'm also trying a gitian build, but that gets stuck at something that seems pretty unrelated (not even the same architecture):

  CXX      crypto/crypto_libbitcoin_crypto_sse41_a-sha256_sse41.o
  CXX      crypto/crypto_libbitcoin_crypto_avx2_a-sha256_avx2.o
crypto/sha256.cpp: In function ‘std::string SHA256AutoDetect()’:
crypto/sha256.cpp:537:83: error: inconsistent operand constraints in an ‘asm’
   __asm__ ("cpuid" : "=a"(a), "=b"(b), "=c"(c), "=d"(d) : "0"(leaf), "2"(subleaf));
                                                                                   ^
crypto/sha256.cpp:537:83: error: inconsistent operand constraints in an ‘asm’
   __asm__ ("cpuid" : "=a"(a), "=b"(b), "=c"(c), "=d"(d) : "0"(leaf), "2"(subleaf));
                                                                                   ^
make[2]: *** [crypto/crypto_libbitcoin_crypto_base_a-sha256.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: Leaving directory `/home/ubuntu/build/bitcoin/distsrc-i686-pc-linux-gnu/src'

ken2812221 · 2018-07-07T15:13:37Z

@Sjors See #13538

Sjors · 2018-07-07T15:41:30Z

@ken2812221 thanks. I just deleted those architectures from the gitian descriptor and tried again.

9c0a172871a27bb727ed27fcdf2f5fd3c6e6b5bc82ea6d7b5745916887a450cb  bitcoin-0.16.99-arm-linux-gnueabihf.tar.gz

Binary works on device as well.

tACK 8ef00e8, assuming Travis gives its blessing

laanwj · 2018-07-09T15:49:35Z

my first question when seeing this is: why only 32-bit?—is this already supported for 64-bit, or does 64-bit ARM provide additional challenges?

sedited · 2018-07-09T16:37:29Z

@laanwj see my comment in #13495 on the difficulties I am having with 64bit arm.

laanwj · 2018-07-10T13:51:21Z

@laanwj see my comment in #13495 on the difficulties I am having with 64bit arm.

Fair enough. It's fine, we can do that in a later PR.

Looks like the travis issue is simply a timeout running into the maximum time limit for jobs.

Sjors · 2018-07-10T14:05:57Z

A particularly stubborn Travis timeout. Maybe the ccache needs to be bigger?

Or perhaps cache /home/travis/build/bitcoin/bitcoin/depends/work/build/arm-linux-gnueabihf as an exception to the general rule of not caching build stuff.

sedited · 2018-07-10T16:35:17Z

I'm not sure if your suggestion @Sjors may have unwanted side effects to the Travis jobs. It seems like the linux qt builds are disabled for this reason in the Travis build matrix. Otherwise I'll remove the Travis change from the pr and hope that enough people run it through gitian to verify?

sedited · 2018-07-10T22:39:16Z

Removed the Travis patch. To test this pull request, build it locally.

Sjors · 2018-07-11T07:44:41Z

I restarted the Apple Darwin instance

theuni

Concept ACK.

theuni · 2018-07-11T19:54:41Z

depends/packages/qt.mk

Let's make this $(host)-g++. Then below, we can copy to qtbase/mkspecs/$(host)-g++, and use sed to replace arm-linux-gnueabi- with $(host)-.

That way subarches (armv6, for example) just work as intended.

The sed patch is only intended for adding hard float support. I don't think this should be done for aarch64 as well (which seems to be the only other mkspec that matches the $(host) triplet).

Yes, but then we can reuse it for aarch64. All that would be necessary to add it (assuming everything else is working) would be:

$(package)_config_opts_aarch64_linux = -platform linux-g++ -xplatform $(host)-g++

I get Invalid target platform 'arm-linux-gnueabihf-g++' when I replace it with $(host)-g++.

This works for me:

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index b4d7756..c09c02d 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -89,7 +89,7 @@ $(package)_config_opts_linux += -system-freetype $(package)_config_opts_linux += -no-feature-sessionmanager $(package)_config_opts_linux += -fontconfig $(package)_config_opts_linux += -no-opengl -$(package)_config_opts_arm_linux = -platform linux-g++ -xplatform $(host) +$(package)_config_opts_arm_linux += -platform linux-g++ -xplatform $(host)-g++ $(package)_config_opts_i686_linux = -xplatform linux-g++-32 $(package)_config_opts_x86_64_linux = -xplatform linux-g++-64 $(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-" @@ -128,6 +128,8 @@ define $(package)_preprocess_cmds cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\ cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\ cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \ + cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/$(host)-g++ && \ + sed -i s/arm-linux-gnueabi-/$(host)-/g qtbase/mkspecs/$(host)-g++/qmake.conf && \ patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\

The second chunk could result in undesired behaviour, because you end up copying the arm mkspecs over whatever the $(host)'s mkspecs are supposed to be.

Good point. Using bitcoin-$(host)-g++ would guarantee that can't happen.

I do not understand how that would work. Can you post another patch for it?

I guess the spec name doesn't need to change, all that matters is the sed. Simplified:

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index b4d7756..22cf4f5 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -89,7 +89,7 @@ $(package)_config_opts_linux += -system-freetype $(package)_config_opts_linux += -no-feature-sessionmanager $(package)_config_opts_linux += -fontconfig $(package)_config_opts_linux += -no-opengl -$(package)_config_opts_arm_linux = -platform linux-g++ -xplatform $(host) +$(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux-g++ $(package)_config_opts_i686_linux = -xplatform linux-g++-32 $(package)_config_opts_x86_64_linux = -xplatform linux-g++-64 $(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-" @@ -128,6 +128,8 @@ define $(package)_preprocess_cmds cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\ cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\ cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \ + cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/bitcoin-linux-g++ && \ + sed -i s/arm-linux-gnueabi-/$(host)-/g qtbase/mkspecs/bitcoin-linux-g++/qmake.conf && \ patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\

The effect is that we essentially have a universal linux mkspec now, it just changes the compiler names to match the HOST passed in.

theuni · 2018-07-11T20:03:31Z

depends/packages/packages.mk

Since there's no point in making the distinction here, let's just get rid of it.

qt_x86_64_linux_packages can just become qt_linux_packages, then qt_i686_linux_packages and qt_arm_linux_package are no longer needed.

The patch does not work yet for aarch64, so I think we should keep it like this until that it is fixed.

Making the suggested change above will make it so that no change is needed here for aarch64.

Substituting qt_x86_64_linux_packages with qt_linux_packages means that qt will be built for all Linux architectures. When I do that and remove the two lines below, a aarch64-linux-gnu depends build will also try to build qt, but will fail as I mentioned in #13495 .

Yes, ok, I forgot we purposefully limited that way.

Some hobbyists are used to using the desktop for interfacing with their raspberry pi. This commits adds qt to the arm-linux-gnueabihf target.

sedited · 2018-07-11T23:08:40Z

Force-pushed to respond to @theuni's review.

Fuzzbawls · 2018-07-12T08:08:48Z

Concept ACK

aarch64 support can be added later, after the issue with xextproto are dealt with and migration to Bionic for gitian builds is complete.

Sjors · 2018-07-12T10:59:58Z

re-tACK 4b69984 (I retested cross-compile and running on a device, not Gitian)

Sjors · 2018-07-13T09:28:08Z

For some reason make in /depends won't build Qt if you run it on an ARM device (armv7l-unknown-linux-gnueabihf).

Adding qt_armv7l_linux_packages:=$(qt_x86_64_linux_packages) fixes that and it builds a bunch of things, but then I get:

Project ERROR: Unknown module(s) in QT: xml
funcs.mk:242: recipe for target '/home/bitcoin/bitcoin/depends/work/build/armv7l-unknown-linux-gnueabihf/qt/5.9.6-8b61ad4d92c/qtbase/.stamp_configured' failed

If it's complicated, I'm fine with trying this fix this some other time, I'd rather get this in 0.17

sedited · 2018-07-13T21:59:02Z

I get the same xml error when I try to apply @Fuzzbawls patch for aarch64 support.

sipa · 2018-07-14T20:30:26Z

@theuni Does your "changes requested" still apply?

theuni

utACK 4b69984

Sjors · 2018-07-17T07:17:30Z

Maybe add "for cross-compilation" to the commit message?

ken2812221 · 2018-07-17T07:36:16Z

utACK 4b69984

4b69984 Add depends 32-bit arm support for bitcoin-qt (Sebastian Kung) Pull request description: Some hobbyists are used to using the desktop for interfacing with their raspberry pi. This commits adds qt to the arm-linux-gnueabihf target. Tree-SHA512: cb03387267eb8f68dfd79735c2c01c5a119c406e5578805e60b377934da42d46cb34d35e45c8843979dfb4070859c553d09ae348b468d9731523f33307132fa8

Sjors · 2018-07-18T08:03:29Z

Gitian builds for master are now broken: #13700

Sjors · 2018-07-24T10:48:25Z

depends/packages/qt.mk

  cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
  cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
+  cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/bitcoin-linux-g++ && \
+  sed -i s/arm-linux-gnueabi-/$(host)-/g qtbase/mkspecs/bitcoin-linux-g++/qmake.conf && \


macOS doesn't like this, see #13750

4b69984 Add depends 32-bit arm support for bitcoin-qt (Sebastian Kung) Pull request description: Some hobbyists are used to using the desktop for interfacing with their raspberry pi. This commits adds qt to the arm-linux-gnueabihf target. Tree-SHA512: cb03387267eb8f68dfd79735c2c01c5a119c406e5578805e60b377934da42d46cb34d35e45c8843979dfb4070859c553d09ae348b468d9731523f33307132fa8

hebasto · 2020-08-17T08:25:30Z

Please see #18536.

sedited changed the title ~~Add depends 32-bit arm support for bitcoin-qt~~ [WIP] Add depends 32-bit arm support for bitcoin-qt Jul 6, 2018

Sjors reviewed Jul 6, 2018

View reviewed changes

fanquake added the Build system label Jul 7, 2018

sedited force-pushed the Qt59arm branch from 8ef00e8 to b86d49f Compare July 8, 2018 12:56

sedited changed the title ~~[WIP] Add depends 32-bit arm support for bitcoin-qt~~ Add depends 32-bit arm support for bitcoin-qt Jul 9, 2018

sedited force-pushed the Qt59arm branch from b86d49f to 14d7757 Compare July 9, 2018 17:10

sedited force-pushed the Qt59arm branch from 14d7757 to 45c3673 Compare July 10, 2018 22:37

martinpgaunt approved these changes Jul 10, 2018

View reviewed changes

laanwj requested a review from theuni July 11, 2018 18:44

theuni suggested changes Jul 11, 2018

View reviewed changes

Add depends 32-bit arm support for bitcoin-qt

4b69984

Some hobbyists are used to using the desktop for interfacing with their raspberry pi. This commits adds qt to the arm-linux-gnueabihf target.

sedited force-pushed the Qt59arm branch from 45c3673 to 4b69984 Compare July 11, 2018 23:07

Sjors mentioned this pull request Jul 12, 2018

GCC-7 and glibc-2.27 back compat code #13177

Merged

Sjors mentioned this pull request Jul 16, 2018

[depends] Don't build Qt dependencies if it doesn't support Qt #13660

Closed

theuni approved these changes Jul 16, 2018

View reviewed changes

laanwj merged commit 4b69984 into bitcoin:master Jul 17, 2018

sedited deleted the Qt59arm branch July 17, 2018 20:10

sedited restored the Qt59arm branch July 17, 2018 20:10

Sjors mentioned this pull request Jul 18, 2018

Gitian crash for ARM compiling BDB depends (Bionic host) #13700

Closed

Bushstar mentioned this pull request Jul 19, 2018

commits from bitcoin/master FeatherCoin/Feathercoin#356

Merged

Sjors reviewed Jul 24, 2018

View reviewed changes

sipa added the Needs release note label Aug 14, 2018

fanquake removed the Needs release note label Mar 20, 2019

BlockMechanic mentioned this pull request Aug 9, 2019

depends : aarch64 android including QT #16568

Closed

bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022

Add depends 32-bit arm support for bitcoin-qt #13604

Add depends 32-bit arm support for bitcoin-qt #13604

Uh oh!

Conversation

sedited commented Jul 6, 2018 • edited by maflcko Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Sjors left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sedited commented Jul 6, 2018

Uh oh!

Sjors commented Jul 6, 2018

Uh oh!

Sjors commented Jul 7, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sedited commented Jul 7, 2018

Uh oh!

Sjors commented Jul 7, 2018

Uh oh!

Sjors commented Jul 7, 2018

Uh oh!

ken2812221 commented Jul 7, 2018

Uh oh!

Sjors commented Jul 7, 2018

Uh oh!

laanwj commented Jul 9, 2018

Uh oh!

sedited commented Jul 9, 2018

Uh oh!

laanwj commented Jul 10, 2018

Uh oh!

Sjors commented Jul 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sedited commented Jul 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sedited commented Jul 10, 2018

Uh oh!

Sjors commented Jul 11, 2018

Uh oh!

theuni left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

sedited commented Jul 6, 2018 •

edited by maflcko

Loading

Sjors left a comment •

edited

Loading

Sjors commented Jul 7, 2018 •

edited

Loading

Sjors commented Jul 10, 2018 •

edited

Loading

sedited commented Jul 10, 2018 •

edited

Loading

Sjors commented Jul 13, 2018 •

edited

Loading