Skip to content

Commit a370253

Browse files
fanquakeknst
authored andcommitted
Merge bitcoin#21354: build, doc: Drop no longer required packages from macOS cross-compiling dependencies
f7f3829 build, doc: Drop libbz2-dev from macOS cross-compiling dependencies (Hennadii Stepanov) d823936 build, doc: Drop libcap-dev from macOS cross-compiling dependencies (Hennadii Stepanov) Pull request description: The `libcap-dev` and `libbz2-dev` packages are no longer required when cross-compiling for macOS. ACKs for top commit: fanquake: ACK f7f3829 Tree-SHA512: 820cdc2724f3346c0942d4d4115fc7206f7bf02889d9fa6cbdbd1d9e3afa03a067c1c3fa64dff596aefdc74898178b7c7d64027a6501486e3b606f4760de04ae
1 parent 6bcc86a commit a370253

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_macos_cross
1010
export HOST=x86_64-apple-darwin
11-
export PACKAGES="cmake libcap-dev libz-dev libbz2-dev libtinfo5 python3-setuptools"
11+
export PACKAGES="cmake libz-dev libtinfo5 python3-setuptools"
1212
export XCODE_VERSION=12.2
1313
export XCODE_BUILD_ID=12B45b
1414
export RUN_UNIT_TESTS=false

contrib/containers/ci/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,7 @@ RUN apt-get update && apt-get install $APT_ARGS \
104104
g++-arm-linux-gnueabihf \
105105
g++-mingw-w64-x86-64 \
106106
jq \
107-
libcap-dev \
108107
libz-dev \
109-
libbz2-dev \
110108
libncurses5 \
111109
nsis \
112110
python3-zmq \

depends/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The paths are automatically configured and no other options are needed unless ta
4747

4848
#### For macOS cross compilation
4949

50-
sudo apt-get install curl bsdmainutils cmake libcap-dev libz-dev libbz2-dev python3-setuptools libtinfo5 xorriso
50+
sudo apt-get install curl bsdmainutils cmake libz-dev python3-setuptools libtinfo5 xorriso
5151

5252
Note: You must obtain the macOS SDK before proceeding with a cross-compile.
5353
Under the depends directory, create a subdirectory named `SDKs`.

0 commit comments

Comments
 (0)