Skip to content

Commit

Permalink
Merge bitcoin#28932: ci: remove python3-setuptools from macOS build…
Browse files Browse the repository at this point in the history
… deps

0ffcc5b ci: remove python3-setuptools from mac build deps (fanquake)

Pull request description:

  Remove no-longer used python-setuptools.
  Followup to bitcoin#28432.
  Related to bitcoin#28845.

ACKs for top commit:
  hebasto:
    ACK 0ffcc5b, I have reviewed the code and it looks OK.
  TheCharlatan:
    ACK 0ffcc5b

Tree-SHA512: c3ac441c85f6f203414e5e2ad0c453ee35fa4765c72c5ff79699aa622c0db767651890ac0c8507f5ed18e18e3b0e23f2952f677476424cfda4df93647a367c26
  • Loading branch information
fanquake committed Nov 24, 2023
2 parents 930bcfd + 0ffcc5b commit c0196be
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
export CONTAINER_NAME=ci_macos_cross
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04"
export HOST=x86_64-apple-darwin
export PACKAGES="cmake libz-dev python3-setuptools zip"
export PACKAGES="cmake libz-dev zip"
export XCODE_VERSION=12.2
export XCODE_BUILD_ID=12B45b
export RUN_UNIT_TESTS=false
Expand Down
2 changes: 1 addition & 1 deletion depends/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The paths are automatically configured and no other options are needed unless ta

#### For macOS cross compilation

sudo apt-get install curl bsdmainutils cmake libz-dev python3-setuptools zip
sudo apt-get install curl bsdmainutils cmake libz-dev zip

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

0 comments on commit c0196be

Please sign in to comment.