From dcf4666e53c1f048f7524f61304fe623846f3940 Mon Sep 17 00:00:00 2001 From: barton26 Date: Mon, 1 Aug 2022 16:09:38 -0400 Subject: [PATCH] scripted-diff: Drop Darwin version for better maintainability -BEGIN VERIFY SCRIPT- sed -i 's/darwin18/darwin/g' $(git grep --files-with-matches 'darwin18') -END VERIFY SCRIPT- --- cd/00_setup_env_mac.sh | 2 +- ci/test/00_setup_env_mac.sh | 2 +- ci/test/00_setup_env_mac_host.sh | 2 +- contrib/macdeploy/README.md | 4 ++-- depends/README.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cd/00_setup_env_mac.sh b/cd/00_setup_env_mac.sh index 64beb8b0bb..68b002b0e4 100755 --- a/cd/00_setup_env_mac.sh +++ b/cd/00_setup_env_mac.sh @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_macos_cross export DOCKER_NAME_TAG=ubuntu:20.04 -export HOST=x86_64-apple-darwin18 +export HOST=x86_64-apple-darwin export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso" export XCODE_VERSION=12.1 export XCODE_BUILD_ID=12A7403 diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index deb273963e..237077efd1 100755 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_macos_cross export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos -export HOST=x86_64-apple-darwin18 +export HOST=x86_64-apple-darwin export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso" export XCODE_VERSION=12.1 export XCODE_BUILD_ID=12A7403 diff --git a/ci/test/00_setup_env_mac_host.sh b/ci/test/00_setup_env_mac_host.sh index e3c7bbbeea..cc55ae79b4 100755 --- a/ci/test/00_setup_env_mac_host.sh +++ b/ci/test/00_setup_env_mac_host.sh @@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8 -export HOST=x86_64-apple-darwin18 +export HOST=x86_64-apple-darwin export GOAL="install" # We run the contrib/install_db4.sh script rather than installing the # Homebrew berkeley-db4 formula to add the Berkeley DB 4.8 dependency diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index 0750e75547..602b120e56 100644 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -57,10 +57,10 @@ the depends directory and deploy the .dmg: ```bash cd depends -make HOST=x86_64-apple-darwin18 +make HOST=x86_64-apple-darwin cd .. ./autogen.sh # not required when building from tarball -CONFIG_SITE=$PWD/depends/x86_64-apple-darwin18/share/config.site ./configure --prefix=/ +CONFIG_SITE=$PWD/depends/x86_64-apple-darwin/share/config.site ./configure --prefix=/ make make deploy ``` diff --git a/depends/README.md b/depends/README.md index 5681b288fe..64627b7abd 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-darwin18` for macOS +- `x86_64-apple-darwin` for macOS - `arm-linux-gnueabihf` for Linux ARM 32 bit - `aarch64-linux-gnu` for Linux ARM 64 bit