diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-11-25 12:47:53 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-11-29 11:32:13 +0100 |
| commit | c32a8437661e2f3f33ec0ed998f9acff8ae98d8b (patch) | |
| tree | 8333d03646e804db7f8ea2523e0cbe02d812f6fa | |
| parent | 6652583be2dba25ff65433b3f7555e75a30439fa (diff) | |
Bump macOS minimum deployment target to 11 for 3rd party dependencies
3rd party dependencies should be built using the same minimum deployment
target as Qt uses for compatibility.
Change-Id: I2edb2c19b90757898f6dcb76ad60602ae2249ebc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg.sh | 4 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/install-openssl.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/install_protobuf.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 91929ccb..cfba1df3 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -86,13 +86,13 @@ if [ "$os" == "linux" ]; then elif [ "$os" == "macos" ]; then brew install yasm - export MACOSX_DEPLOYMENT_TARGET=10.15 + export MACOSX_DEPLOYMENT_TARGET=11 build_ffmpeg sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" elif [ "$os" == "macos-universal" ]; then brew install yasm - export MACOSX_DEPLOYMENT_TARGET=10.15 + export MACOSX_DEPLOYMENT_TARGET=11 build_ffmpeg "arm64" build_ffmpeg "x86_64" diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 602c713b..d091956a 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -83,7 +83,7 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then commonFlags="no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 -Wa,--noexecstack" - export MACOSX_DEPLOYMENT_TARGET=10.15 + export MACOSX_DEPLOYMENT_TARGET=11 opensslBuild="${opensslHome}-build" opensslDestdir="${opensslHome}-destdir" diff --git a/coin/provisioning/common/unix/install_protobuf.sh b/coin/provisioning/common/unix/install_protobuf.sh index 431c9bc3..4288c376 100755 --- a/coin/provisioning/common/unix/install_protobuf.sh +++ b/coin/provisioning/common/unix/install_protobuf.sh @@ -77,7 +77,7 @@ echo "Configuring and building protobuf" installPrefix="/usr/local" if uname -a |grep -q Darwin; then - extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" + extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11" SetEnvVar PATH "\$PATH:$installPrefix/bin" fi |