diff options
| author | Elias Toivola <elias.toivola@qt.io> | 2024-01-12 14:14:07 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-01-31 05:21:31 +0000 |
| commit | 8e8af54d1249ec1542fc53381ecdd5aec65c6a40 (patch) | |
| tree | de26921d5c67799d0885039d656cb18662f2a8a7 /coin/provisioning/common | |
| parent | 34b96646acfd7fc10138538186c1fabed8f5d6ac (diff) | |
Provisioning: Remove macOS 11 and bump minimum targets to 12
Drop macOS 11 out from dev (6.8) branch as it is EOL or very near it. This removes macOS 11 test configurations and bumps macOS targets to
12 in provision scripts.
Task-number: QTQAINFRA-6009
Change-Id: I2ea2764fb4a14eb508e39330acfc0947b94343fc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'coin/provisioning/common')
4 files changed, 5 insertions, 5 deletions
diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 004be781..a3dc2a13 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -84,14 +84,14 @@ if [ "$os" == "linux" ]; then elif [ "$os" == "macos" ]; then brew install yasm - export MACOSX_DEPLOYMENT_TARGET=11 + export MACOSX_DEPLOYMENT_TARGET=12 build_ffmpeg sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" elif [ "$os" == "macos-universal" ]; then brew install yasm - export MACOSX_DEPLOYMENT_TARGET=11 + export MACOSX_DEPLOYMENT_TARGET=12 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 9724cb3c..d9b44784 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -47,7 +47,7 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then commonFlags=(no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 "-Wa,--noexecstack") - export MACOSX_DEPLOYMENT_TARGET=11 + export MACOSX_DEPLOYMENT_TARGET=12 opensslBuild="${opensslHome}-build" opensslDestdir="${opensslHome}-destdir" diff --git a/coin/provisioning/common/unix/install_grpc.sh b/coin/provisioning/common/unix/install_grpc.sh index 54035d55..3b94816a 100755 --- a/coin/provisioning/common/unix/install_grpc.sh +++ b/coin/provisioning/common/unix/install_grpc.sh @@ -42,7 +42,7 @@ if uname -a |grep -qv "Darwin"; then fi if uname -a |grep -q Darwin; then - extraCMakeArgs=("-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=11) + extraCMakeArgs=("-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=12) SetEnvVar PATH "\$PATH:$installPrefix/bin" fi diff --git a/coin/provisioning/common/unix/install_protobuf.sh b/coin/provisioning/common/unix/install_protobuf.sh index 23855ec0..7ace4eae 100755 --- a/coin/provisioning/common/unix/install_protobuf.sh +++ b/coin/provisioning/common/unix/install_protobuf.sh @@ -40,7 +40,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=11) + extraCMakeArgs=("-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=12) SetEnvVar PATH "\$PATH:$installPrefix/bin" fi |