Skip to content
This repository was archived by the owner on Aug 6, 2023. It is now read-only.

Commit 96dda8b

Browse files
ken2812221ken2812221
committed
[depends] Add riscv qt depends support for cross compiling bitcoin-qt
1 parent 2ab7208 commit 96dda8b

File tree

10 files changed

+47
-1
lines changed

10 files changed

+47
-1
lines changed

‎depends/packages/libX11.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ $(package)_config_opts=--disable-xkb --disable-static
1010
$(package)_config_opts_linux=--with-pic
1111
endef
1212

13+
define $(package)_preprocess_cmds
14+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
15+
endef
16+
1317
define $(package)_config_cmds
1418
$($(package)_autoconf)
1519
endef

‎depends/packages/libXau.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ define $(package)_set_vars
1010
$(package)_config_opts_linux=--with-pic
1111
endef
1212

13+
define $(package)_preprocess_cmds
14+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
15+
endef
16+
1317
define $(package)_config_cmds
1418
$($(package)_autoconf)
1519
endef

‎depends/packages/libXext.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ define $(package)_set_vars
99
$(package)_config_opts=--disable-static
1010
endef
1111

12+
define $(package)_preprocess_cmds
13+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
14+
endef
15+
1216
define $(package)_config_cmds
1317
$($(package)_autoconf)
1418
endef

‎depends/packages/libxcb.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ $(package)_config_opts=--disable-static
1010
endef
1111

1212
define $(package)_preprocess_cmds
13+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux &&\
1314
sed "s/pthread-stubs//" -i configure
1415
endef
1516

‎depends/packages/protobuf.mk‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ define $(package)_set_vars
1111
$(package)_config_opts_linux=--with-pic
1212
endef
1313

14+
define $(package)_preprocess_cmds
15+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . &&\
16+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub gtest/build-aux
17+
endef
18+
1419
define $(package)_config_cmds
1520
$($(package)_autoconf)
1621
endef

‎depends/packages/qrencode.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ $(package)_config_opts=--disable-shared -without-tools --disable-sdltest
99
$(package)_config_opts_linux=--with-pic
1010
endef
1111

12+
define $(package)_preprocess_cmds
13+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub use
14+
endef
15+
1216
define $(package)_config_cmds
1317
$($(package)_autoconf)
1418
endef

‎depends/packages/qt.mk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(package)_dependencies=openssl zlib
88
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
99
$(package)_build_subdir=qtbase
1010
$(package)_qt_libs=corelib network widgets gui plugins testlib
11-
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch
11+
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch
1212

1313
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
1414
$(package)_qttranslations_sha256_hash=9822084f8e2d2939ba39f4af4c0c2320e45d5996762a9423f833055607604ed8
@@ -93,6 +93,7 @@ $(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux
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_aarch64_linux = -xplatform linux-aarch64-gnu-g++
96+
$(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
9697
$(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-"
9798
$(package)_build_env = QT_RCC_TEST=1
9899
$(package)_build_env += QT_RCC_SOURCE_DATE_OVERRIDE=1
@@ -139,6 +140,7 @@ define $(package)_preprocess_cmds
139140
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
140141
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
141142
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
143+
patch -p1 -i $($(package)_patch_dir)/fix_riscv64_arch.patch &&\
142144
echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
143145
echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
144146
sed -i.old "s|QMAKE_CFLAGS = |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \

‎depends/packages/xproto.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ define $(package)_set_vars
88
$(package)_config_opts=--disable-shared
99
endef
1010

11+
define $(package)_preprocess_cmds
12+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
13+
endef
14+
1115
define $(package)_config_cmds
1216
$($(package)_autoconf)
1317
endef

‎depends/packages/xtrans.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ define $(package)_set_vars
99
$(package)_config_opts_linux=--with-pic --disable-static
1010
endef
1111

12+
define $(package)_preprocess_cmds
13+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
14+
endef
15+
1216
define $(package)_config_cmds
1317
$($(package)_autoconf)
1418
endef

‎depends/patches/qt/fix_riscv64_arch.patch‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/qtbase/src/3rdparty/double-conversion/include/double-conversion/utils.h b/qtbase/src/3rdparty/double-conversion/include/double-conversion/utils.h
2+
index 20bfd36..93729fa 100644
3+
--- a/qtbase/src/3rdparty/double-conversion/include/double-conversion/utils.h
4+
+++ b/qtbase/src/3rdparty/double-conversion/include/double-conversion/utils.h
5+
@@ -65,7 +65,8 @@
6+
defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
7+
defined(__SH4__) || defined(__alpha__) || \
8+
defined(_MIPS_ARCH_MIPS32R2) || \
9+
- defined(__AARCH64EL__)
10+
+ defined(__AARCH64EL__) || defined(__aarch64__) || \
11+
+ defined(__riscv)
12+
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
13+
#elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
14+
#if defined(_WIN32)

0 commit comments

Comments
 (0)