diff options
| author | fanquake <fanquake@gmail.com> | 2021-03-15 14:44:43 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-03-15 14:46:11 +0800 |
| commit | d42078e93b29193c9b7b8c9cd833ec803fadbf9f (patch) | |
| tree | 7e6a1eb4e7ce67c77bdff78927b042f72b786c97 | |
| parent | 3c631917f3e0da84ee48295b7d2e93bc202bae0c (diff) | |
| parent | e4c0cada791135e2d0a36638541c03feff0bd6bc (diff) | |
| download | bitcoin-d42078e93b29193c9b7b8c9cd833ec803fadbf9f.tar.xz | |
Merge #21437: gitian, ci: Drop unneeded python3-dev package for macOS builds
e4c0cada791135e2d0a36638541c03feff0bd6bc ci, gitian: Drop unneeded python3-dev package for macOS builds (Hennadii Stepanov)
Pull request description:
ACKs for top commit:
fanquake:
ACK e4c0cada791135e2d0a36638541c03feff0bd6bc - gitian builds match and I checked that this doesn't end up installed as a side-effect of another package.
Tree-SHA512: 520a3909b106a0e005b195c5395691edf62b76ee2df43b6971b7aa193648d68e6dac69cb4f1dc474f594b015a2fc2074061865e571d89365174beb5c1780356f
| -rw-r--r-- | ci/test/00_setup_env_mac.sh | 2 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-osx.yml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index 645dcffd02..6ce3812447 100644 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_macos_cross export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos (Focal is used in the gitian build as well) export HOST=x86_64-apple-darwin18 -export PACKAGES="cmake imagemagick librsvg2-bin libz-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso" +export PACKAGES="cmake imagemagick librsvg2-bin libz-dev libtiff-tools libtinfo5 python3-setuptools xorriso" export XCODE_VERSION=11.3.1 export XCODE_BUILD_ID=11C505 export RUN_UNIT_TESTS=false diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 98c3888b45..c37ad5b842 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -23,7 +23,6 @@ packages: - "imagemagick" - "libz-dev" - "python3" -- "python3-dev" - "python3-setuptools" - "fonts-tuffy" - "xorriso" |