mirror of
https://github.com/dashpay/dash.git
synced 2024-12-23 19:12:47 +01:00
merge bitcoin#22993: set OSX_MIN_VERSION to 10.15
This commit is contained in:
parent
fd03a23e85
commit
5856f2c124
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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()
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -48,7 +48,7 @@ Please replace `<host>` 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
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
<plist version="0.9">
|
||||
<dict>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.14.0</string>
|
||||
<string>10.15.0</string>
|
||||
|
||||
<key>LSArchitecturePriority</key>
|
||||
<array>
|
||||
|
Loading…
Reference in New Issue
Block a user