mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-27 07:06:33 +08:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
14
coin/provisioning/qtci-linux-RHEL-8.8-x86_64/42-install-vcpkg-ports.sh
Executable file
14
coin/provisioning/qtci-linux-RHEL-8.8-x86_64/42-install-vcpkg-ports.sh
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2023 The Qt Company Ltd.
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
echo "Installing vcpkg ports"
|
||||
echo "VCPKG_ROOT: ${VCPKG_ROOT}"
|
||||
echo "ANDOID_NDK_HOME: ${ANDROID_NDK_HOME}"
|
||||
|
||||
# Installing common ports
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
|
||||
# Installing platform specific ports
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports-android.sh"
|
||||
Reference in New Issue
Block a user