diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2023-01-18 08:25:55 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-13 11:24:02 +0000 |
| commit | 3103815c33fabb39a11fa2ced9e2b78293a5dade (patch) | |
| tree | edc0797f6a55b9d5d81b43f757b2e8c206ef7bdb | |
| parent | ccc414c844a869205ab908bc7f39278aff00a9e2 (diff) | |
| download | qt5-3103815c33fabb39a11fa2ced9e2b78293a5dade.tar.gz | |
Provisioning: Install OpenSSL 3 for Red Hat 8.4
Task-number: QTQAINFRA-4889
Change-Id: Iae783e66a3f4b1421993c5db746bd44a1ef81dd4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 6e655d52e3a8c2aba1a99fa33f9a6f8dca0c28ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
3 files changed, 10 insertions, 1 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 8d8a52e8..298289f7 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -164,7 +164,7 @@ Configurations: Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies'] Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh index f0a723ab..8de9a630 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh @@ -48,6 +48,7 @@ installPackages=() installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) +installPackages+=(openssl3) installPackages+=(openssl3-devel) installPackages+=(freetype-devel) installPackages+=(fontconfig-devel) diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/09-openssl.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/09-openssl.sh new file mode 100755 index 00000000..6877a74d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/09-openssl.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -ex + +# Required by Rhel source build +sudo yum -y install perl-IPC-Cmd + +"$(dirname "$0")/../common/unix/install-openssl.sh" "linux" |