diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-08-05 13:22:11 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-08-05 13:22:12 -0400 |
| commit | 2ab72080ad7568b5f1c7d2611f9792c9f3811f65 (patch) | |
| tree | dec7f3814a40bbe552488fa4cfbef4cc696e20b1 | |
| parent | 2b67354aa584c4aabae049a67767ac7b70e2d01a (diff) | |
| parent | 00db418176043226bcc337398ec514a973fa6da5 (diff) | |
| download | bitcoin-2ab72080ad7568b5f1c7d2611f9792c9f3811f65.tar.xz | |
Merge #13696: Add aarch64 qt depends support for cross compiling bitcoin-qt
00db418176 Add aarch64 qt depends support for cross compiling bitcoin-qt (TheCharlatan)
Pull request description:
This also adds a generic qt linux target in packages.mk . I am a bit confused by the existing docs for the RISC addition. Are there boards that would support running bitcoin-qt, or at the very least forwarding X over ssh? Is everybody building depends with `NO_QT=1` when targeting RISC? If not, I will revert the change for a generic qt linux package definition back to the piecemeal solution.
This pull request should close #13495
Tree-SHA512: 519b951bf50f214ad725e5330094582a212333cd85b0ae442c67f9afec5629995dfad130258c7706a61f7b7cccbfa49bce69b9931f7e30cf12b382cd9a0a4749
| -rw-r--r-- | depends/packages/packages.mk | 4 | ||||
| -rw-r--r-- | depends/packages/qt.mk | 1 | ||||
| -rw-r--r-- | depends/packages/xextproto.mk | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 69acb19b8f..5fe6f98da2 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -3,9 +3,7 @@ packages:=boost openssl libevent zeromq qt_native_packages = native_protobuf qt_packages = qrencode protobuf zlib -qt_x86_64_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans -qt_i686_linux_packages:=$(qt_x86_64_linux_packages) -qt_arm_linux_packages:=$(qt_x86_64_linux_packages) +qt_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans qt_darwin_packages=qt qt_mingw32_packages=qt diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 7fdd7612c3..71b7f83db9 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -92,6 +92,7 @@ $(package)_config_opts_linux += -no-opengl $(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_aarch64_linux = -xplatform linux-aarch64-gnu-g++ $(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-" $(package)_build_env = QT_RCC_TEST=1 $(package)_build_env += QT_RCC_SOURCE_DATE_OVERRIDE=1 diff --git a/depends/packages/xextproto.mk b/depends/packages/xextproto.mk index 98a11eb497..7065237bd5 100644 --- a/depends/packages/xextproto.mk +++ b/depends/packages/xextproto.mk @@ -4,6 +4,10 @@ $(package)_download_path=http://xorg.freedesktop.org/releases/individual/proto $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0 +define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . +endef + define $(package)_set_vars $(package)_config_opts=--disable-shared endef |