lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Install openssl3 into Debian VM

Browse Source 
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>
This commit is contained in:
Simo Fält
2024-03-07 10:12:43 +02:00
parent 3bbe6f0250
commit 67e95f4591
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/cmake_platforms.yaml
View File

@@ -188,7 +188,7 @@ Configurations:
Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests'] 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' 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: [ Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
] ]
- -

13
coin/provisioning/common/unix/install-openssl.sh
View File

@@ -25,15 +25,16 @@ cd "$opensslSource"
pwd pwd
if [[ "$os" == "linux" ]]; then 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 make && make install_sw install_ssldirs
SetEnvVar "OPENSSL_HOME" "$opensslHome" SetEnvVar "OPENSSL_HOME" "$opensslHome"
SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\"" SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\""
if uname -a |grep -q "Ubuntu"; then SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib64:$LD_LIBRARY_PATH\""
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
elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
# Below target location has been hard coded into Coin. # Below target location has been hard coded into Coin.

7
coin/provisioning/qtci-linux-Debian-11.6-aarch64/09-openssl.sh Normal file
View File

@@ -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"