aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorTheCharlatan <seb.kung@gmail.com>2018-07-17 23:54:44 +0200
committerTheCharlatan <seb.kung@gmail.com>2018-07-29 15:59:55 +0200
commit00db418176043226bcc337398ec514a973fa6da5 (patch)
tree9cc4cd45e10ba2fd5b5a6b3eaf44fa56cd97c3a9 /depends
parente8ffec69f773e67ae82535afc87164eb8102f05e (diff)
Add aarch64 qt depends support for cross compiling bitcoin-qt
Diffstat (limited to 'depends')
-rw-r--r--depends/packages/packages.mk4
-rw-r--r--depends/packages/qt.mk1
-rw-r--r--depends/packages/xextproto.mk4
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