Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#30204: depends: consolidate dependency docs
Browse files Browse the repository at this point in the history
a27e1ce depends: consolidate dependency docs (fanquake)

Pull request description:

  Adds missing `g++` for macOS. This is needed by Qt:
  ```bash
  Configuring qt...
  Creating qmake...
  gmake[1]: Entering directory '/bitcoin/depends/work/build/arm64-apple-darwin/qt/5.15.14-4bca24c8f89/qtbase/qmake'
  gmake[1]: g++: No such file or directory
  gmake[1]: *** [Makefile:250: main.o] Error 127
  ```

  `xz-utils` was also missing (but generally already installed), and is needed for the `.tar.xz` tarballs.

  Remove `bsdmainutils`, as this is only needed by the main build system (for tests), and isn't needed to complete a depends build.

ACKs for top commit:
  maflcko:
    ACK a27e1ce

Tree-SHA512: 720c31d4d4c9b86fda4aace405d528193714dd3e526f38d5b8a83e4b676a433b9c891f01d86d673be9ac848458eda8a89b0981003a42eaa6d97bacc2e914396a
  • Loading branch information
fanquake committed May 31, 2024
2 parents 3ac1465 + a27e1ce commit 457e184
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions depends/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,13 @@ The paths are automatically configured and no other options are needed.

### Install the required dependencies: Ubuntu & Debian

#### Common

apt install automake bison cmake curl libtool make patch pkg-config python3 xz-utils

#### For macOS cross compilation

sudo apt-get install curl bsdmainutils cmake zip
sudo apt-get install g++ zip

Note: You must obtain the macOS SDK before proceeding with a cross-compile.
Under the depends directory, create a subdirectory named `SDKs`.
Expand All @@ -60,7 +64,7 @@ For more information, see [SDK Extraction](../contrib/macdeploy/README.md#sdk-ex

Common linux dependencies:

sudo apt-get install make automake cmake curl g++-multilib libtool binutils bsdmainutils pkg-config python3 patch bison
sudo apt-get install g++-multilib binutils

For linux ARM cross compilation:

Expand Down

0 comments on commit 457e184

Please sign in to comment.