Skip to content

Commit 2620ac4

Browse files
committed
Merge #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
2 parents b4d2265 + f7f3829 commit 2620ac4

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
@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
99
export CONTAINER_NAME=ci_macos_cross
1010
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos (Focal is used in the gitian build as well)
1111
export HOST=x86_64-apple-darwin18
12-
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso"
12+
export PACKAGES="cmake imagemagick librsvg2-bin libz-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso"
1313
export XCODE_VERSION=11.3.1
1414
export XCODE_BUILD_ID=11C505
1515
export RUN_UNIT_TESTS=false

contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ packages:
2121
- "bsdmainutils"
2222
- "cmake"
2323
- "imagemagick"
24-
- "libcap-dev"
2524
- "libz-dev"
26-
- "libbz2-dev"
2725
- "python3"
2826
- "python3-dev"
2927
- "python3-setuptools"

depends/README.md

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

4545
#### For macOS cross compilation
4646

47-
sudo apt-get install curl librsvg2-bin libtiff-tools bsdmainutils cmake imagemagick libcap-dev libz-dev libbz2-dev python3-setuptools libtinfo5 xorriso
47+
sudo apt-get install curl librsvg2-bin libtiff-tools bsdmainutils cmake imagemagick libz-dev python3-setuptools libtinfo5 xorriso
4848

4949
#### For Win64 cross compilation
5050

0 commit comments

Comments
 (0)