diff options
| author | merge-script <fanquake@gmail.com> | 2024-05-31 15:30:29 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-05-31 15:30:29 +0100 |
| commit | 457e1846d2bf6ef9d54b9ba1a330ba8bbff13091 (patch) | |
| tree | 4e9dc49c35a0275554db64a684b405d2497a4dde /depends | |
| parent | 3ac1465cd9da8d328972a67d4c623a012a276e81 (diff) | |
| parent | a27e1ceb9f9c9239af9b0a151c84a57573ea646a (diff) | |
| download | bitcoin-457e1846d2bf6ef9d54b9ba1a330ba8bbff13091.tar.xz | |
Merge bitcoin/bitcoin#30204: depends: consolidate dependency docs
a27e1ceb9f9c9239af9b0a151c84a57573ea646a 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 a27e1ceb9f9c9239af9b0a151c84a57573ea646a
Tree-SHA512: 720c31d4d4c9b86fda4aace405d528193714dd3e526f38d5b8a83e4b676a433b9c891f01d86d673be9ac848458eda8a89b0981003a42eaa6d97bacc2e914396a
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/README.md | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/depends/README.md b/depends/README.md index 17def65d3e..7ac075f4ba 100644 --- a/depends/README.md +++ b/depends/README.md @@ -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`. @@ -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: |