diff options
| author | fanquake <fanquake@gmail.com> | 2023-12-01 20:27:13 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-12-01 20:27:21 +0000 |
| commit | 5aa37ca01d15c699b95d7b532c157966b1475fa2 (patch) | |
| tree | b2099f0b3fa14472418d69eb0293704f569be129 | |
| parent | a97a89244e9100e3e6ba1a14d4f5e86d6eb2e86e (diff) | |
| parent | 97d53e90badc01224139a4a4356b934f338568d4 (diff) | |
Merge bitcoin/bitcoin#28973: ci: remove `libz-dev` from macOS build deps
97d53e90badc01224139a4a4356b934f338568d4 ci: remove libz-dev from macOS build deps (fanquake)
Pull request description:
Remove no-longer used libz-dev (from DMG compression).
Followup to #28432.
Missed this in #28932.
ACKs for top commit:
TheCharlatan:
ACK 97d53e90badc01224139a4a4356b934f338568d4
Tree-SHA512: ea4e46d83a11cfb0d77e7c5b370359864a026ca58e02de1a3d30458e4463dabd338db9546da63b782a7fa0ce199446c418fbfdfc400f3803b0ea9dd626aed42f
| -rwxr-xr-x | ci/test/00_setup_env_mac.sh | 2 | ||||
| -rw-r--r-- | depends/README.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index b952d49074..d97a292778 100755 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -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 zip" +export PACKAGES="cmake zip" export XCODE_VERSION=12.2 export XCODE_BUILD_ID=12B45b export RUN_UNIT_TESTS=false diff --git a/depends/README.md b/depends/README.md index 41b70264c3..a2e05ab1e8 100644 --- a/depends/README.md +++ b/depends/README.md @@ -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 zip + sudo apt-get install curl bsdmainutils cmake zip Note: You must obtain the macOS SDK before proceeding with a cross-compile. Under the depends directory, create a subdirectory named `SDKs`. |