From 5856f2c124e5708f7b1772974cd9a9af5acb03fc Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com> Date: Sat, 2 Oct 2021 08:39:55 +0530 Subject: [PATCH] merge bitcoin#22993: set OSX_MIN_VERSION to 10.15 --- .gitlab-ci.yml | 8 ++++---- .travis.yml | 2 +- CMakeLists.txt | 2 +- ci/matrix.sh | 2 +- contrib/gitian-descriptors/gitian-osx.yml | 6 +++--- depends/README.md | 2 +- depends/hosts/darwin.mk | 2 +- depends/packages/bls-dash.mk | 2 +- doc/build-cross.md | 4 ++-- doc/build-generic.md | 2 +- share/qt/Info.plist.in | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 804b5a85b3..c04c120816 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ builder-image: before_script: - echo HOST=$HOST - | - if [ "$HOST" = "x86_64-apple-darwin18" ]; then + if [ "$HOST" = "x86_64-apple-darwin19" ]; then mkdir -p depends/SDKs mkdir -p depends/sdk-sources OSX_SDK_BASENAME="Xcode-${XCODE_VERSION}-${XCODE_BUILD_ID}-extracted-SDK-with-libcxx-headers.tar.gz" @@ -194,12 +194,12 @@ x86_64-unknown-linux-gnu-release: HOST: x86_64-unknown-linux-gnu DEP_OPTS: "NO_UPNP=1" -x86_64-apple-darwin18: +x86_64-apple-darwin19: extends: - .build-depends-template - .skip-in-fast-mode-template variables: - HOST: x86_64-apple-darwin18 + HOST: x86_64-apple-darwin19 ### @@ -265,7 +265,7 @@ mac-build: - .build-template - .skip-in-fast-mode-template needs: - - x86_64-apple-darwin18 + - x86_64-apple-darwin19 variables: BUILD_TARGET: mac diff --git a/.travis.yml b/.travis.yml index 71162bcf74..34755430e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -296,7 +296,7 @@ after_success: - stage: test name: 'macOS 10.12 [GOAL: deploy]' env: >- - HOST=x86_64-apple-darwin18 + HOST=x86_64-apple-darwin19 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools" export XCODE_VERSION=11.3.1 export XCODE_BUILD_ID=11C505 diff --git a/CMakeLists.txt b/CMakeLists.txt index fc11e66d8f..cfb1d2fdb0 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-darwin18) + set(DEPENDS_PREFIX depends/x86_64-apple-darwin19) elseif(WIN32) set(DEPENDS_PREFIX depends/x86_64-w64-mingw32) endif() diff --git a/ci/matrix.sh b/ci/matrix.sh index adaadbac26..cbdf3a186e 100755 --- a/ci/matrix.sh +++ b/ci/matrix.sh @@ -76,7 +76,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-darwin18 + export HOST=x86_64-apple-darwin19 export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --enable-werror" export XCODE_VERSION=11.3.1 export XCODE_BUILD_ID=11C505 diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index e9fdcd1838..7da7273082 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -39,7 +39,7 @@ script: | set -e -o pipefail WRAP_DIR=$HOME/wrapped - HOSTS="x86_64-apple-darwin18" + HOSTS="x86_64-apple-darwin19" CONFIGFLAGS="--enable-reduce-exports --disable-miner --disable-bench --disable-gui-tests XORRISOFS=${WRAP_DIR}/xorrisofs DMG=${WRAP_DIR}/dmg --enable-crash-hooks" FAKETIME_HOST_PROGS="" FAKETIME_PROGS="ar ranlib date dmg xorrisofs" @@ -187,8 +187,8 @@ script: | done mkdir -p $OUTDIR/src mv $SOURCEDIST $OUTDIR/src - mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin18.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz - mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin18-debug.tar.gz ${OUTDIR}/${DISTNAME}-osx64-debug.tar.gz + mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin19.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz + mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin19-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 246d0549d7..9a559cdfa1 100644 --- a/depends/README.md +++ b/depends/README.md @@ -21,7 +21,7 @@ created. To use it for Dash: Common `host-platform-triplets` for cross compilation are: - `x86_64-w64-mingw32` for Win64 -- `x86_64-apple-darwin18` for macOS +- `x86_64-apple-darwin19` 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 c7120872ed..e4b7ca22e2 100644 --- a/depends/hosts/darwin.mk +++ b/depends/hosts/darwin.mk @@ -1,4 +1,4 @@ -OSX_MIN_VERSION=10.14 +OSX_MIN_VERSION=10.15 OSX_SDK_VERSION=10.15.6 XCODE_VERSION=12.1 XCODE_BUILD_ID=12A7403 diff --git a/depends/packages/bls-dash.mk b/depends/packages/bls-dash.mk index bb266f513f..74f45b8f61 100644 --- a/depends/packages/bls-dash.mk +++ b/depends/packages/bls-dash.mk @@ -7,7 +7,7 @@ $(package)_build_subdir=build $(package)_sha256_hash=276c8573104e5f18bb5b9fd3ffd49585dda5ba5f6de2de74759dda8ca5a9deac $(package)_dependencies=gmp cmake $(package)_patches=gcc_alignment_cast.patch -$(package)_darwin_triplet=x86_64-apple-darwin18 +$(package)_darwin_triplet=x86_64-apple-darwin19 $(package)_relic_version=3a23142be0a5510a3aa93cd6c76fc59d3fc732a5 $(package)_relic_download_path=https://github.com/relic-toolkit/relic/archive diff --git a/doc/build-cross.md b/doc/build-cross.md index bf760ab2b9..56932824de 100644 --- a/doc/build-cross.md +++ b/doc/build-cross.md @@ -26,13 +26,13 @@ $ tar -C depends/SDKs -xf depends/sdk-sources/Xcode-12.1-12A7403-extracted-SDK-w When building the dependencies, as described in [build-generic](build-generic.md), use ```bash -$ make HOST=x86_64-apple-darwin18 -j4 +$ make HOST=x86_64-apple-darwin19 -j4 ``` When building Dash Core, use ```bash -$ ./configure --prefix=`pwd`/depends/x86_64-apple-darwin18 +$ ./configure --prefix=`pwd`/depends/x86_64-apple-darwin19 ``` Windows 64bit Cross-compilation diff --git a/doc/build-generic.md b/doc/build-generic.md index e0fdf1b1af..fa7b7775f2 100644 --- a/doc/build-generic.md +++ b/doc/build-generic.md @@ -48,7 +48,7 @@ Please replace `` with your local system's `host-platform-triplet`. The fo - `i686-pc-linux-gnu` for Linux32 - `x86_64-pc-linux-gnu` for Linux64 - `x86_64-w64-mingw32` for Win64 -- `x86_64-apple-darwin18` for MacOSX +- `x86_64-apple-darwin19` for macOS - `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 bb6c0e9bf3..680790dad2 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -3,7 +3,7 @@ LSMinimumSystemVersion - 10.14.0 + 10.15.0 LSArchitecturePriority