From ced48380b8f1385b9d273f6f95a9a1024cbf938c Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com> Date: Thu, 21 Nov 2019 11:08:47 -0500 Subject: [PATCH] partial merge #17550: set minimum supported macOS to 10.12 --- .gitlab-ci.yml | 8 ++++---- .travis.yml | 4 ++-- CMakeLists.txt | 2 +- ci/matrix.sh | 2 +- contrib/gitian-descriptors/gitian-osx.yml | 6 +++--- depends/README.md | 2 +- depends/hosts/darwin.mk | 2 +- doc/build-cross.md | 4 ++-- doc/build-generic.md | 2 +- share/qt/Info.plist.in | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95458e4ce6..9b6457c9e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ builder-image: before_script: - echo HOST=$HOST - | - if [ "$HOST" = "x86_64-apple-darwin14" ]; then + if [ "$HOST" = "x86_64-apple-darwin16" ]; then echo "Downloading MacOS SDK" mkdir -p depends/SDKs mkdir -p depends/sdk-sources @@ -187,12 +187,12 @@ x86_64-unknown-linux-gnu-release: HOST: x86_64-unknown-linux-gnu DEP_OPTS: "NO_UPNP=1" -x86_64-apple-darwin14: +x86_64-apple-darwin16: extends: - .build-depends-template - .skip-in-fast-mode-template variables: - HOST: x86_64-apple-darwin14 + HOST: x86_64-apple-darwin16 ### @@ -267,7 +267,7 @@ mac-build: - .build-template - .skip-in-fast-mode-template needs: - - x86_64-apple-darwin14 + - x86_64-apple-darwin16 variables: BUILD_TARGET: mac diff --git a/.travis.yml b/.travis.yml index 86d7e695c2..b1ae558a90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -310,9 +310,9 @@ after_success: BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports" - stage: test - name: 'macOS 10.10 [GOAL: deploy]' + name: 'macOS 10.12 [GOAL: deploy]' env: >- - HOST=x86_64-apple-darwin14 + HOST=x86_64-apple-darwin16 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git" OSX_SDK=10.11 RUN_UNIT_TESTS=false diff --git a/CMakeLists.txt b/CMakeLists.txt index 8de9b0a2b2..fb78ca81fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories( if(UNIX AND NOT APPLE) set(DEPENDS_PREFIX depends/x86_64-pc-linux-gnu) elseif(APPLE) - set(DEPENDS_PREFIX depends/x86_64-apple-darwin14) + set(DEPENDS_PREFIX depends/x86_64-apple-darwin16) elseif(WIN32) set(DEPENDS_PREFIX depends/x86_64-w64-mingw32) endif() diff --git a/ci/matrix.sh b/ci/matrix.sh index 6f306c1d4e..bf139f96bc 100755 --- a/ci/matrix.sh +++ b/ci/matrix.sh @@ -81,7 +81,7 @@ elif [ "$BUILD_TARGET" = "linux64_release" ]; then export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports" export PYZMQ=true elif [ "$BUILD_TARGET" = "mac" ]; then - export HOST=x86_64-apple-darwin14 + export HOST=x86_64-apple-darwin16 export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner" export OSX_SDK=10.11 export GOAL="all deploy" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index c02c25e35d..ced7e75349 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -38,7 +38,7 @@ script: | set -e -o pipefail WRAP_DIR=$HOME/wrapped - HOSTS="x86_64-apple-darwin14" + HOSTS="x86_64-apple-darwin16" CONFIGFLAGS="--enable-reduce-exports --disable-miner --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage --enable-crash-hooks" FAKETIME_HOST_PROGS="" FAKETIME_PROGS="ar ranlib date dmg genisoimage" @@ -188,8 +188,8 @@ script: | done mkdir -p $OUTDIR/src mv $SOURCEDIST $OUTDIR/src - mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin14.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz - mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin14-debug.tar.gz ${OUTDIR}/${DISTNAME}-osx64-debug.tar.gz + mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin16.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz + mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin16-debug.tar.gz ${OUTDIR}/${DISTNAME}-osx64-debug.tar.gz # Compress ccache (otherwise the assert file will get too huge) if [ "$CCACHE_DIR" != "" ]; then diff --git a/depends/README.md b/depends/README.md index 6a9a87be16..3378a0e934 100644 --- a/depends/README.md +++ b/depends/README.md @@ -22,7 +22,7 @@ Common `host-platform-triplets` for cross compilation are: - `i686-w64-mingw32` for Win32 - `x86_64-w64-mingw32` for Win64 -- `x86_64-apple-darwin14` for macOS +- `x86_64-apple-darwin16` for macOS - `arm-linux-gnueabihf` for Linux ARM 32 bit - `aarch64-linux-gnu` for Linux ARM 64 bit - `riscv32-linux-gnu` for Linux RISC-V 32 bit diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk index a1c943d60b..1f88c209cf 100644 --- a/depends/hosts/darwin.mk +++ b/depends/hosts/darwin.mk @@ -1,4 +1,4 @@ -OSX_MIN_VERSION=10.10 +OSX_MIN_VERSION=10.12 OSX_SDK_VERSION=10.11 OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk LD64_VERSION=253.9 diff --git a/doc/build-cross.md b/doc/build-cross.md index 119a1208cb..b568bfe0c9 100644 --- a/doc/build-cross.md +++ b/doc/build-cross.md @@ -26,13 +26,13 @@ $ tar -C depends/SDKs -xf depends/sdk-sources/MacOSX10.11.sdk.tar.gz When building the dependencies, as described in [build-generic](build-generic.md), use ```bash -$ make HOST=x86_64-apple-darwin14 -j4 +$ make HOST=x86_64-apple-darwin16 -j4 ``` When building Dash Core, use ```bash -$ ./configure --prefix=`pwd`/depends/x86_64-apple-darwin14 +$ ./configure --prefix=`pwd`/depends/x86_64-apple-darwin16 ``` Windows 64bit Cross-compilation diff --git a/doc/build-generic.md b/doc/build-generic.md index b4845dbcd3..deb83ebd1a 100644 --- a/doc/build-generic.md +++ b/doc/build-generic.md @@ -49,7 +49,7 @@ Please replace `` with your local system's `host-platform-triplet`. The fo - `x86_64-pc-linux-gnu` for Linux64 - `i686-w64-mingw32` for Win32 - `x86_64-w64-mingw32` for Win64 -- `x86_64-apple-darwin14` for MacOSX +- `x86_64-apple-darwin16` for MacOSX - `arm-linux-gnueabihf` for Linux ARM 32 bit - `aarch64-linux-gnu` for Linux ARM 64 bit diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index 6e6d759c48..12c661d016 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -3,7 +3,7 @@ LSMinimumSystemVersion - 10.10.0 + 10.12.0 LSArchitecturePriority