Skip to content

Commit 69a29b5

Browse files
author
MarcoFalke
committed
Merge #14264: doc: Split depends installation instructions per arch
fad95e8 doc: Split build linux dependencies (MarcoFalke) 0000009 doc: Split depends installation instructions per arch (MarcoFalke) Pull request description: The current depends installation instructions fail on bionic with ``` E: Unable to locate package g++-4.8-aarch64-linux-gnu E: Unable to locate package gcc-4.8-aarch64-linux-gnu E: Unable to locate package g++-4.8-arm-linux-gnueabihf E: Unable to locate package gcc-4.8-arm-linux-gnueabihf ``` Also, they fail due to missing dependencies `make automake cmake pkg-config python3` Fix this by removing the explicit version and splitting them into common instructions and instructions per linux architecture. Tree-SHA512: 25d5efa7450a0b1bbd569f431158f5a25bf4fe34f6adc32ebdfd6b6db9447ce083f555f20ff5b9f7c458864986c15d65219a31a1cd2b18bad9965ece2ea5e3be
2 parents bfaeb84 + fad95e8 commit 69a29b5

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

depends/README.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,38 @@ Common `host-platform-triplets` for cross compilation are:
3030

3131
No other options are needed, the paths are automatically configured.
3232

33-
Install the required dependencies: Ubuntu & Debian
34-
--------------------------------------------------
33+
### Install the required dependencies: Ubuntu & Debian
3534

36-
For macOS cross compilation:
35+
#### For macOS cross compilation
3736

3837
sudo apt-get install curl librsvg2-bin libtiff-tools bsdmainutils cmake imagemagick libcap-dev libz-dev libbz2-dev python-setuptools
3938

40-
For Win32/Win64 cross compilation:
39+
#### For Win32/Win64 cross compilation
4140

4241
- see [build-windows.md](../doc/build-windows.md#cross-compilation-for-ubuntu-and-windows-subsystem-for-linux)
4342

44-
For linux (including i386, ARM) cross compilation:
43+
#### For linux (including i386, ARM) cross compilation
4544

46-
sudo apt-get install curl g++-aarch64-linux-gnu g++-4.8-aarch64-linux-gnu gcc-4.8-aarch64-linux-gnu binutils-aarch64-linux-gnu g++-arm-linux-gnueabihf g++-4.8-arm-linux-gnueabihf gcc-4.8-arm-linux-gnueabihf binutils-arm-linux-gnueabihf g++-4.8-multilib gcc-4.8-multilib binutils-gold bsdmainutils
45+
Common linux dependencies:
46+
47+
sudo apt-get install make automake cmake curl g++-multilib libtool binutils-gold bsdmainutils pkg-config python3
48+
49+
For linux ARM cross compilation:
50+
51+
sudo apt-get install g++-arm-linux-gnueabihf binutils-arm-linux-gnueabihf
52+
53+
For linux AARCH64 cross compilation:
54+
55+
sudo apt-get install g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
4756

4857
For linux RISC-V 64-bit cross compilation (there are no packages for 32-bit):
4958

50-
sudo apt-get install curl g++-riscv64-linux-gnu binutils-riscv64-linux-gnu
59+
sudo apt-get install g++-riscv64-linux-gnu binutils-riscv64-linux-gnu
5160

5261
RISC-V known issue: gcc-7.3.0 and gcc-7.3.1 result in a broken `test_bitcoin` executable (see https://github.com/bitcoin/bitcoin/pull/13543),
5362
this is apparently fixed in gcc-8.1.0.
5463

55-
Dependency Options:
64+
### Dependency Options
5665
The following can be set when running make: make FOO=bar
5766

5867
SOURCES_PATH: downloaded sources will be placed here
@@ -70,7 +79,7 @@ The following can be set when running make: make FOO=bar
7079
If some packages are not built, for example `make NO_WALLET=1`, the appropriate
7180
options will be passed to bitcoin's configure. In this case, `--disable-wallet`.
7281

73-
Additional targets:
82+
### Additional targets
7483

7584
download: run 'make download' to fetch all sources without building them
7685
download-osx: run 'make download-osx' to fetch all sources needed for macOS builds

doc/build-unix.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@ tuned to conserve memory with additional CXXFLAGS:
7070

7171
Build requirements:
7272

73-
sudo apt-get install build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils python3 libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev
73+
sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils python3
74+
75+
Now, you can either build from self-compiled [depends](/depends/README.md) or install the required dependencies:
76+
77+
sudo apt-get libssl-dev libevent-dev libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev
7478

7579
BerkeleyDB is required for the wallet.
7680

@@ -97,7 +101,7 @@ ZMQ dependencies (provides ZMQ API):
97101

98102
sudo apt-get install libzmq3-dev
99103

100-
#### Dependencies for the GUI
104+
GUI dependencies:
101105

102106
If you want to build bitcoin-qt, make sure that the required packages for Qt development
103107
are installed. Qt 5 is necessary to build the GUI.

0 commit comments

Comments
 (0)