mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-08 10:31:50 -05:00
Merge bitcoin/bitcoin#23585: scripted-diff: Drop Darwin version for better maintainability
2f356a0ca8
scripted-diff: Drop Darwin version for better maintainability (Hennadii Stepanov) Pull request description: After this PR, any macOS tools version bumping in the future will touch fewer files in the repo. Pointing a Darwin version for the `--host` system does not matter for the following reasons: - in terms of the resulted binaries, we should only care about the minimum supported macOS version which is a separated parameter in our build system. - in terms of the build system itself, the usage of the `$(host)` variable is self-consistent enough. Btw `$(host_os)` value already has the version dropped: ``` $ make -C depends --no-print-directory print-host_os HOST=x86_64-apple-darwin19 host_os=darwin ``` ACKs for top commit: gruve-p: ACK2f356a0ca8
promag: ACK2f356a0ca8
. fanquake: ACK2f356a0ca8
Tree-SHA512: 374896ab0ba02b0d8b4b21431fe963bd213b0d09586e0898c13a4c5fa294c1b693f1b2c92880c245c4157c14217b4825b36522f461930477f4d2a727086ebb2a
This commit is contained in:
commit
1b76b18f8a
7 changed files with 11 additions and 11 deletions
|
@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
|
||||||
|
|
||||||
export CONTAINER_NAME=ci_macos_cross
|
export CONTAINER_NAME=ci_macos_cross
|
||||||
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos
|
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos
|
||||||
export HOST=x86_64-apple-darwin19
|
export HOST=x86_64-apple-darwin
|
||||||
export PACKAGES="cmake imagemagick librsvg2-bin libz-dev libtiff-tools libtinfo5 python3-setuptools xorriso"
|
export PACKAGES="cmake imagemagick librsvg2-bin libz-dev libtiff-tools libtinfo5 python3-setuptools xorriso"
|
||||||
export XCODE_VERSION=12.1
|
export XCODE_VERSION=12.1
|
||||||
export XCODE_BUILD_ID=12A7403
|
export XCODE_BUILD_ID=12A7403
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
|
|
||||||
export HOST=x86_64-apple-darwin19
|
export HOST=x86_64-apple-darwin
|
||||||
export PIP_PACKAGES="zmq lief"
|
export PIP_PACKAGES="zmq lief"
|
||||||
export GOAL="install"
|
export GOAL="install"
|
||||||
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports"
|
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports"
|
||||||
|
|
|
@ -75,7 +75,7 @@ crucial differences:
|
||||||
|
|
||||||
1. Since only Windows and macOS build outputs require codesigning, the `HOSTS`
|
1. Since only Windows and macOS build outputs require codesigning, the `HOSTS`
|
||||||
environment variable will have a sane default value of `x86_64-w64-mingw32
|
environment variable will have a sane default value of `x86_64-w64-mingw32
|
||||||
x86_64-apple-darwin19` instead of all the platforms.
|
x86_64-apple-darwin` instead of all the platforms.
|
||||||
2. The `guix-codesign` command ***requires*** a `DETACHED_SIGS_REPO` flag.
|
2. The `guix-codesign` command ***requires*** a `DETACHED_SIGS_REPO` flag.
|
||||||
* _**DETACHED_SIGS_REPO**_
|
* _**DETACHED_SIGS_REPO**_
|
||||||
|
|
||||||
|
@ -159,7 +159,7 @@ which case you can override the default list by setting the space-separated
|
||||||
`HOSTS` environment variable:
|
`HOSTS` environment variable:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
env HOSTS='x86_64-w64-mingw32 x86_64-apple-darwin19' ./contrib/guix/guix-build
|
env HOSTS='x86_64-w64-mingw32 x86_64-apple-darwin' ./contrib/guix/guix-build
|
||||||
```
|
```
|
||||||
|
|
||||||
See the [recognized environment variables][env-vars-list] section for more
|
See the [recognized environment variables][env-vars-list] section for more
|
||||||
|
@ -224,7 +224,7 @@ details.
|
||||||
|
|
||||||
_(defaults to "x86\_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu
|
_(defaults to "x86\_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu
|
||||||
riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu
|
riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu
|
||||||
x86\_64-w64-mingw32 x86\_64-apple-darwin19")_
|
x86\_64-w64-mingw32 x86\_64-apple-darwin")_
|
||||||
|
|
||||||
* _**SOURCES_PATH**_
|
* _**SOURCES_PATH**_
|
||||||
|
|
||||||
|
|
|
@ -76,7 +76,7 @@ mkdir -p "$VERSION_BASE"
|
||||||
# Default to building for all supported HOSTs (overridable by environment)
|
# Default to building for all supported HOSTs (overridable by environment)
|
||||||
export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu
|
export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu
|
||||||
x86_64-w64-mingw32
|
x86_64-w64-mingw32
|
||||||
x86_64-apple-darwin19}"
|
x86_64-apple-darwin}"
|
||||||
|
|
||||||
# Usage: distsrc_for_host HOST
|
# Usage: distsrc_for_host HOST
|
||||||
#
|
#
|
||||||
|
|
|
@ -91,7 +91,7 @@ fi
|
||||||
################
|
################
|
||||||
|
|
||||||
# Default to building for all supported HOSTs (overridable by environment)
|
# Default to building for all supported HOSTs (overridable by environment)
|
||||||
export HOSTS="${HOSTS:-x86_64-w64-mingw32 x86_64-apple-darwin19}"
|
export HOSTS="${HOSTS:-x86_64-w64-mingw32 x86_64-apple-darwin}"
|
||||||
|
|
||||||
# Usage: distsrc_for_host HOST
|
# Usage: distsrc_for_host HOST
|
||||||
#
|
#
|
||||||
|
|
|
@ -147,7 +147,7 @@ case "$HOST" in
|
||||||
#
|
#
|
||||||
# After the native packages in depends are built, the ld wrapper should
|
# After the native packages in depends are built, the ld wrapper should
|
||||||
# no longer affect our build, as clang would instead reach for
|
# no longer affect our build, as clang would instead reach for
|
||||||
# x86_64-apple-darwin19-ld from cctools
|
# x86_64-apple-darwin-ld from cctools
|
||||||
;;
|
;;
|
||||||
*) export GUIX_LD_WRAPPER_DISABLE_RPATH=yes ;;
|
*) export GUIX_LD_WRAPPER_DISABLE_RPATH=yes ;;
|
||||||
esac
|
esac
|
||||||
|
@ -420,8 +420,8 @@ mkdir -p "$DISTSRC"
|
||||||
find "${DISTNAME}" -print0 \
|
find "${DISTNAME}" -print0 \
|
||||||
| sort --zero-terminated \
|
| sort --zero-terminated \
|
||||||
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
|
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
|
||||||
| gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin19/osx64}.tar.gz" \
|
| gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin/osx64}.tar.gz" \
|
||||||
|| ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin19/osx64}.tar.gz" && exit 1 )
|
|| ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin/osx64}.tar.gz" && exit 1 )
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
) # $DISTSRC/installed
|
) # $DISTSRC/installed
|
||||||
|
|
|
@ -28,7 +28,7 @@ Common `host-platform-triplet`s for cross compilation are:
|
||||||
- `i686-pc-linux-gnu` for Linux 32 bit
|
- `i686-pc-linux-gnu` for Linux 32 bit
|
||||||
- `x86_64-pc-linux-gnu` for x86 Linux
|
- `x86_64-pc-linux-gnu` for x86 Linux
|
||||||
- `x86_64-w64-mingw32` for Win64
|
- `x86_64-w64-mingw32` for Win64
|
||||||
- `x86_64-apple-darwin19` for macOS
|
- `x86_64-apple-darwin` 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
|
||||||
- `powerpc64-linux-gnu` for Linux POWER 64-bit (big endian)
|
- `powerpc64-linux-gnu` for Linux POWER 64-bit (big endian)
|
||||||
|
|
Loading…
Add table
Reference in a new issue