mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 11:32:46 +01:00
partial merge #17550: set minimum supported macOS to 10.12
This commit is contained in:
parent
e60b249883
commit
ced48380b8
@ -42,7 +42,7 @@ builder-image:
|
|||||||
before_script:
|
before_script:
|
||||||
- echo HOST=$HOST
|
- echo HOST=$HOST
|
||||||
- |
|
- |
|
||||||
if [ "$HOST" = "x86_64-apple-darwin14" ]; then
|
if [ "$HOST" = "x86_64-apple-darwin16" ]; then
|
||||||
echo "Downloading MacOS SDK"
|
echo "Downloading MacOS SDK"
|
||||||
mkdir -p depends/SDKs
|
mkdir -p depends/SDKs
|
||||||
mkdir -p depends/sdk-sources
|
mkdir -p depends/sdk-sources
|
||||||
@ -187,12 +187,12 @@ x86_64-unknown-linux-gnu-release:
|
|||||||
HOST: x86_64-unknown-linux-gnu
|
HOST: x86_64-unknown-linux-gnu
|
||||||
DEP_OPTS: "NO_UPNP=1"
|
DEP_OPTS: "NO_UPNP=1"
|
||||||
|
|
||||||
x86_64-apple-darwin14:
|
x86_64-apple-darwin16:
|
||||||
extends:
|
extends:
|
||||||
- .build-depends-template
|
- .build-depends-template
|
||||||
- .skip-in-fast-mode-template
|
- .skip-in-fast-mode-template
|
||||||
variables:
|
variables:
|
||||||
HOST: x86_64-apple-darwin14
|
HOST: x86_64-apple-darwin16
|
||||||
|
|
||||||
###
|
###
|
||||||
|
|
||||||
@ -267,7 +267,7 @@ mac-build:
|
|||||||
- .build-template
|
- .build-template
|
||||||
- .skip-in-fast-mode-template
|
- .skip-in-fast-mode-template
|
||||||
needs:
|
needs:
|
||||||
- x86_64-apple-darwin14
|
- x86_64-apple-darwin16
|
||||||
variables:
|
variables:
|
||||||
BUILD_TARGET: mac
|
BUILD_TARGET: mac
|
||||||
|
|
||||||
|
@ -310,9 +310,9 @@ after_success:
|
|||||||
BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
|
BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
|
||||||
|
|
||||||
- stage: test
|
- stage: test
|
||||||
name: 'macOS 10.10 [GOAL: deploy]'
|
name: 'macOS 10.12 [GOAL: deploy]'
|
||||||
env: >-
|
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"
|
PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git"
|
||||||
OSX_SDK=10.11
|
OSX_SDK=10.11
|
||||||
RUN_UNIT_TESTS=false
|
RUN_UNIT_TESTS=false
|
||||||
|
@ -20,7 +20,7 @@ include_directories(
|
|||||||
if(UNIX AND NOT APPLE)
|
if(UNIX AND NOT APPLE)
|
||||||
set(DEPENDS_PREFIX depends/x86_64-pc-linux-gnu)
|
set(DEPENDS_PREFIX depends/x86_64-pc-linux-gnu)
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
set(DEPENDS_PREFIX depends/x86_64-apple-darwin14)
|
set(DEPENDS_PREFIX depends/x86_64-apple-darwin16)
|
||||||
elseif(WIN32)
|
elseif(WIN32)
|
||||||
set(DEPENDS_PREFIX depends/x86_64-w64-mingw32)
|
set(DEPENDS_PREFIX depends/x86_64-w64-mingw32)
|
||||||
endif()
|
endif()
|
||||||
|
@ -81,7 +81,7 @@ elif [ "$BUILD_TARGET" = "linux64_release" ]; then
|
|||||||
export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports"
|
export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports"
|
||||||
export PYZMQ=true
|
export PYZMQ=true
|
||||||
elif [ "$BUILD_TARGET" = "mac" ]; then
|
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 BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner"
|
||||||
export OSX_SDK=10.11
|
export OSX_SDK=10.11
|
||||||
export GOAL="all deploy"
|
export GOAL="all deploy"
|
||||||
|
@ -38,7 +38,7 @@ script: |
|
|||||||
set -e -o pipefail
|
set -e -o pipefail
|
||||||
|
|
||||||
WRAP_DIR=$HOME/wrapped
|
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"
|
CONFIGFLAGS="--enable-reduce-exports --disable-miner --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage --enable-crash-hooks"
|
||||||
FAKETIME_HOST_PROGS=""
|
FAKETIME_HOST_PROGS=""
|
||||||
FAKETIME_PROGS="ar ranlib date dmg genisoimage"
|
FAKETIME_PROGS="ar ranlib date dmg genisoimage"
|
||||||
@ -188,8 +188,8 @@ script: |
|
|||||||
done
|
done
|
||||||
mkdir -p $OUTDIR/src
|
mkdir -p $OUTDIR/src
|
||||||
mv $SOURCEDIST $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-darwin16.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-debug.tar.gz ${OUTDIR}/${DISTNAME}-osx64-debug.tar.gz
|
||||||
|
|
||||||
# Compress ccache (otherwise the assert file will get too huge)
|
# Compress ccache (otherwise the assert file will get too huge)
|
||||||
if [ "$CCACHE_DIR" != "" ]; then
|
if [ "$CCACHE_DIR" != "" ]; then
|
||||||
|
@ -22,7 +22,7 @@ Common `host-platform-triplets` for cross compilation are:
|
|||||||
|
|
||||||
- `i686-w64-mingw32` for Win32
|
- `i686-w64-mingw32` for Win32
|
||||||
- `x86_64-w64-mingw32` for Win64
|
- `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
|
- `arm-linux-gnueabihf` for Linux ARM 32 bit
|
||||||
- `aarch64-linux-gnu` for Linux ARM 64 bit
|
- `aarch64-linux-gnu` for Linux ARM 64 bit
|
||||||
- `riscv32-linux-gnu` for Linux RISC-V 32 bit
|
- `riscv32-linux-gnu` for Linux RISC-V 32 bit
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
OSX_MIN_VERSION=10.10
|
OSX_MIN_VERSION=10.12
|
||||||
OSX_SDK_VERSION=10.11
|
OSX_SDK_VERSION=10.11
|
||||||
OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk
|
OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk
|
||||||
LD64_VERSION=253.9
|
LD64_VERSION=253.9
|
||||||
|
@ -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
|
When building the dependencies, as described in [build-generic](build-generic.md), use
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ make HOST=x86_64-apple-darwin14 -j4
|
$ make HOST=x86_64-apple-darwin16 -j4
|
||||||
```
|
```
|
||||||
|
|
||||||
When building Dash Core, use
|
When building Dash Core, use
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ ./configure --prefix=`pwd`/depends/x86_64-apple-darwin14
|
$ ./configure --prefix=`pwd`/depends/x86_64-apple-darwin16
|
||||||
```
|
```
|
||||||
|
|
||||||
Windows 64bit Cross-compilation
|
Windows 64bit Cross-compilation
|
||||||
|
@ -49,7 +49,7 @@ Please replace `<host>` with your local system's `host-platform-triplet`. The fo
|
|||||||
- `x86_64-pc-linux-gnu` for Linux64
|
- `x86_64-pc-linux-gnu` for Linux64
|
||||||
- `i686-w64-mingw32` for Win32
|
- `i686-w64-mingw32` for Win32
|
||||||
- `x86_64-w64-mingw32` for Win64
|
- `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
|
- `arm-linux-gnueabihf` for Linux ARM 32 bit
|
||||||
- `aarch64-linux-gnu` for Linux ARM 64 bit
|
- `aarch64-linux-gnu` for Linux ARM 64 bit
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<plist version="0.9">
|
<plist version="0.9">
|
||||||
<dict>
|
<dict>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>10.10.0</string>
|
<string>10.12.0</string>
|
||||||
|
|
||||||
<key>LSArchitecturePriority</key>
|
<key>LSArchitecturePriority</key>
|
||||||
<array>
|
<array>
|
||||||
|
Loading…
Reference in New Issue
Block a user