From a3702534e56c126af8e53bf44eac9be9afb8417f Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 5 Mar 2021 09:30:17 +0800 Subject: [PATCH] Merge #21354: build, doc: Drop no longer required packages from macOS cross-compiling dependencies f7f3829a68df173c54ab11ecfe162b840afb64e8 build, doc: Drop libbz2-dev from macOS cross-compiling dependencies (Hennadii Stepanov) d8239362e283107657a5a6577890fdb198a1d334 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 f7f3829a68df173c54ab11ecfe162b840afb64e8 Tree-SHA512: 820cdc2724f3346c0942d4d4115fc7206f7bf02889d9fa6cbdbd1d9e3afa03a067c1c3fa64dff596aefdc74898178b7c7d64027a6501486e3b606f4760de04ae --- ci/test/00_setup_env_mac.sh | 2 +- contrib/containers/ci/Dockerfile | 2 -- depends/README.md | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index 3c90b09581..fb9322eb09 100755 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_macos_cross export HOST=x86_64-apple-darwin -export PACKAGES="cmake libcap-dev libz-dev libbz2-dev libtinfo5 python3-setuptools" +export PACKAGES="cmake libz-dev libtinfo5 python3-setuptools" export XCODE_VERSION=12.2 export XCODE_BUILD_ID=12B45b export RUN_UNIT_TESTS=false diff --git a/contrib/containers/ci/Dockerfile b/contrib/containers/ci/Dockerfile index 38dd7456bc..7f8cc4d44a 100644 --- a/contrib/containers/ci/Dockerfile +++ b/contrib/containers/ci/Dockerfile @@ -104,9 +104,7 @@ RUN apt-get update && apt-get install $APT_ARGS \ g++-arm-linux-gnueabihf \ g++-mingw-w64-x86-64 \ jq \ - libcap-dev \ libz-dev \ - libbz2-dev \ libncurses5 \ nsis \ python3-zmq \ diff --git a/depends/README.md b/depends/README.md index b8dc83bc96..404e66fc23 100644 --- a/depends/README.md +++ b/depends/README.md @@ -47,7 +47,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 libcap-dev libz-dev libbz2-dev python3-setuptools libtinfo5 xorriso + sudo apt-get install curl bsdmainutils cmake libz-dev python3-setuptools libtinfo5 xorriso Note: You must obtain the macOS SDK before proceeding with a cross-compile. Under the depends directory, create a subdirectory named `SDKs`.