Skip to content

Commit a6f5b6f

Browse files
committed
Merge #17550: build: set minimum supported macOS to 10.12
7d7bf2f build: set minimum supported macOS to 10.12 (fanquake) Pull request description: Extracted from #16392 as this doesn't need to wait for the other build changes. Reasoning: * `10.10` has been unsupported since July 2017 (~3 years at `v0.20.0` release) * `10.11` has been unsupported since July 2018 (~2 years at `v0.20.0` release) * macOS users are consistent at upgrading to new releases. * Qt 5.12 LTS only supports [macOS > 10.12](https://doc-snapshots.qt.io/qt5-5.12/supported-platforms.html). As long as we're supporting macOS < 10.12 we would not be able to bump Qt in depends to 5.12 for the `v0.20.0` release. Once we drop support for 10.12 and start using the 10.15 SDK there are some other follow ups: * Enabling support for [`thread_local`](https://github.com/bitcoin/bitcoin/blob/master/configure.ac#L901). * Removing some of the macOS notification code * Removing macOS [startup item code](https://github.com/bitcoin/bitcoin/blob/master/src/qt/guiutil.cpp#L695). There was also some related discussion in the `#bitcoin-builds` channel yesterday arvo. ACKs for top commit: laanwj: ACK 7d7bf2f dongcarl: post-IRC-grilling-ACK 7d7bf2f Tree-SHA512: 30b0ed75e3b4df2d3f94db2091b7982c1ea7be8fb3a2732d8efd1a53ef1e492d7265a47e90c38e92f66e638d10e9400a6ecb56e5093688bb26d1621645b453e8
2 parents 2a97d2b + 7d7bf2f commit a6f5b6f

File tree

9 files changed

+14
-15
lines changed

9 files changed

+14
-15
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,16 @@ jobs:
144144
FILE_ENV="./ci/test/00_setup_env_native_nowallet.sh"
145145
146146
- stage: test
147-
name: 'macOS 10.10 [GOAL: deploy] [no functional tests]'
147+
name: 'macOS 10.12 [GOAL: deploy] [no functional tests]'
148148
env: >-
149149
FILE_ENV="./ci/test/00_setup_env_mac.sh"
150150
151151
- stage: test
152152
name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
153153
os: osx
154154
# Use the most recent version:
155-
# Xcode 11, macOS 10.14, JDK 12.0.1
155+
# Xcode 11.2.1, macOS 10.14, JDK 13.0.1, SDK 10.15
156156
# https://docs.travis-ci.com/user/reference/osx/#macos-version
157-
osx_image: xcode11
157+
osx_image: xcode11.2
158158
env: >-
159159
FILE_ENV="./ci/test/00_setup_env_mac_host.sh"

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-apple-darwin14
9+
export HOST=x86_64-apple-darwin16
1010
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools"
1111
export OSX_SDK=10.11
1212
export RUN_UNIT_TESTS=false

ci/test/00_setup_env_mac_host.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-apple-darwin14
9+
export HOST=x86_64-apple-darwin16
1010
export BREW_PACKAGES="automake berkeley-db4 libtool boost miniupnpc pkg-config qt qrencode python3 ccache zeromq"
1111
export PIP_PACKAGES="zmq"
1212
export RUN_CI_ON_HOST=true

contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ script: |
3737
set -e -o pipefail
3838
3939
WRAP_DIR=$HOME/wrapped
40-
HOSTS="x86_64-apple-darwin14"
40+
HOSTS="x86_64-apple-darwin16"
4141
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage"
4242
FAKETIME_HOST_PROGS=""
4343
FAKETIME_PROGS="ar ranlib date dmg genisoimage"

depends/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Common `host-platform-triplets` for cross compilation are:
2525
- `i686-pc-linux-gnu` for Linux 32 bit
2626
- `x86_64-pc-linux-gnu` for x86 Linux
2727
- `x86_64-w64-mingw32` for Win64
28-
- `x86_64-apple-darwin14` for macOS
28+
- `x86_64-apple-darwin16` for macOS
2929
- `arm-linux-gnueabihf` for Linux ARM 32 bit
3030
- `aarch64-linux-gnu` for Linux ARM 64 bit
3131
- `riscv32-linux-gnu` for Linux RISC-V 32 bit

depends/hosts/darwin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OSX_MIN_VERSION=10.10
1+
OSX_MIN_VERSION=10.12
22
OSX_SDK_VERSION=10.11
33
OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk
44
LD64_VERSION=253.9

doc/build-osx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ tail -f $HOME/Library/Application\ Support/Bitcoin/debug.log
110110
```
111111

112112
## Notes
113-
* Tested on OS X 10.10 Yosemite through macOS 10.14 Mojave on 64-bit Intel
113+
* Tested on OS X 10.12 Sierra through macOS 10.15 Catalina on 64-bit Intel
114114
processors only.
115115
* Building with downloaded Qt binaries is not officially supported. See the notes in [#7714](https://github.com/bitcoin/bitcoin/issues/7714).
116116

doc/release-notes.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,15 @@ Compatibility
4646
==============
4747

4848
Bitcoin Core is supported and extensively tested on operating systems using
49-
the Linux kernel, macOS 10.10+, and Windows 7 and newer. It is not recommended
49+
the Linux kernel, macOS 10.12+, and Windows 7 and newer. It is not recommended
5050
to use Bitcoin Core on unsupported systems.
5151

5252
Bitcoin Core should also work on most other Unix-like systems but is not
5353
as frequently tested on them.
5454

55-
From Bitcoin Core 0.17.0 onwards, macOS versions earlier than 10.10 are no
56-
longer supported, as Bitcoin Core is now built using Qt 5.9.x which requires
57-
macOS 10.10+. Additionally, Bitcoin Core does not yet change appearance when
58-
macOS "dark mode" is activated.
55+
From Bitcoin Core 0.20.0 onwards, macOS versions earlier than 10.12 are no
56+
longer supported. Additionally, Bitcoin Core does not yet change appearance
57+
when macOS "dark mode" is activated.
5958

6059
In addition to previously supported CPU platforms, this release's pre-compiled
6160
distribution provides binaries for the RISC-V platform.

share/qt/Info.plist.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="0.9">
44
<dict>
55
<key>LSMinimumSystemVersion</key>
6-
<string>10.10.0</string>
6+
<string>10.12.0</string>
77

88
<key>LSArchitecturePriority</key>
99
<array>

0 commit comments

Comments
 (0)