Skip to content

Commit 75bea05

Browse files
committed
Merge #13604: Add depends 32-bit arm support for bitcoin-qt
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
2 parents 0568dcd + 4b69984 commit 75bea05

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

depends/packages/packages.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ qt_packages = qrencode protobuf zlib
55

66
qt_x86_64_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
77
qt_i686_linux_packages:=$(qt_x86_64_linux_packages)
8+
qt_arm_linux_packages:=$(qt_x86_64_linux_packages)
89

910
qt_darwin_packages=qt
1011
qt_mingw32_packages=qt

depends/packages/qt.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ $(package)_config_opts_linux += -system-freetype
8989
$(package)_config_opts_linux += -no-feature-sessionmanager
9090
$(package)_config_opts_linux += -fontconfig
9191
$(package)_config_opts_linux += -no-opengl
92-
$(package)_config_opts_arm_linux = -platform linux-g++ -xplatform $(host)
92+
$(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
9393
$(package)_config_opts_i686_linux = -xplatform linux-g++-32
9494
$(package)_config_opts_x86_64_linux = -xplatform linux-g++-64
9595
$(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-"
@@ -128,6 +128,8 @@ define $(package)_preprocess_cmds
128128
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
129129
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
130130
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
131+
cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/bitcoin-linux-g++ && \
132+
sed -i s/arm-linux-gnueabi-/$(host)-/g qtbase/mkspecs/bitcoin-linux-g++/qmake.conf && \
131133
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
132134
patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\
133135
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\

0 commit comments

Comments
 (0)