diff options
author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-11-30 11:17:48 +0100 |
---|---|---|
committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-12-18 06:32:32 +0100 |
commit | a5a639314526cd356ca3b6ce6bfe6e3059cf943a (patch) | |
tree | b4a5f600c3b3a2db5701a031b0f2bb353e0dcaac /coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | |
parent | a1b278c3a33bd1a516b2eb7b42165f68bd9164cd (diff) |
Provisioning: Install OpenSSL via Vcpkg on Linux
- Add a custom triplets for building dynamic android libraries
- Set `ANDROID_NDK_HOME` environment variable, as it is needed when
vcpkg builds for Android.
- Install `perl-IPC-Cmd` when necessary, requirement for OpenSSL.
- Install openSSL for x64-linux-qt, x86-android-qt, and
x86_64-android-qt. The latter android triplet has been renamed from
vcpkg's official `x64-android.cmake` triplet to further clarify the
android abi.
- Adjusted version.txt to account for the existence of two OpenSSL. The
system OpenSSL now shows up as `System's OpenSSL` in `version.txt`.
Task-number: QTBUG-115715
Change-Id: I6cf9b808d26bbea97ebeeadac58cef5ede25ee50
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 9eb8ef7f..99976038 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -143,6 +143,8 @@ installPackages+=(cifs-utils) installPackages+=(jq) # zip, needed for vcpkg caching installPackages+=(zip) +# OpenSSL requirement, built by vcpkg +installPackages+=(perl-IPC-Cmd) sudo yum -y install "${installPackages[@]}" @@ -163,4 +165,4 @@ sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses OpenSSLVersion="$(openssl3 version |cut -b 9-14)" -echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt +echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt |