diff options
| author | Simo Fält <simo.falt@qt.io> | 2024-03-07 10:12:43 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2024-03-07 22:55:09 +0200 |
| commit | 67e95f4591266666ffcb9988ce460d8fdfd4a0a0 (patch) | |
| tree | 347314311f1c20681ca17250203ca38b724857c6 | |
| parent | 3bbe6f0250ecbdcab9ddbebc4c9a3a922eb67ec1 (diff) | |
Provisioning: Install openssl3 into Debian VM
Task-number: QTBUG-123049
Pick-to: 6.7 dev
Change-Id: Ia4bacf1b7751e15915fc7faca473cb0408a72e35
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 2 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/install-openssl.sh | 13 | ||||
| -rw-r--r-- | coin/provisioning/qtci-linux-Debian-11.6-aarch64/09-openssl.sh | 7 |
3 files changed, 15 insertions, 7 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 20054f9f..4961836d 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -188,7 +188,7 @@ Configurations: Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -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}}', ] - diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 9724cb3c..91c8386f 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -25,15 +25,16 @@ cd "$opensslSource" pwd if [[ "$os" == "linux" ]]; then - ./Configure --prefix="$opensslHome" shared enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack" + if [ $(uname -m) = aarch64 ]; then + arch=$(uname -m) + else + arch="x86_64" + fi + ./Configure --prefix="$opensslHome" shared enable-ec_nistp_64_gcc_128 "linux-$arch" "-Wa,--noexecstack" make && make install_sw install_ssldirs SetEnvVar "OPENSSL_HOME" "$opensslHome" SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\"" - if uname -a |grep -q "Ubuntu"; then - echo "export LD_LIBRARY_PATH=$opensslHome/lib64:$LD_LIBRARY_PATH" >> ~/.bash_profile - else - echo "export LD_LIBRARY_PATH=$opensslHome/lib64:$LD_LIBRARY_PATH" >> ~/.bashrc - fi + SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib64:$LD_LIBRARY_PATH\"" elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then # Below target location has been hard coded into Coin. diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/09-openssl.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/09-openssl.sh new file mode 100644 index 00000000..3a65360e --- /dev/null +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/09-openssl.sh @@ -0,0 +1,7 @@ +#!/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 + +set -ex + +"$(dirname "$0")/../common/unix/install-openssl.sh" "linux" |