From e34e62b3b27cdce4308140291ddbb65c68c4eea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 7 Mar 2024 10:12:43 +0200 Subject: Provisioning: Install openssl3 into Debian VM Task-number: QTBUG-123049 Change-Id: Ia4bacf1b7751e15915fc7faca473cb0408a72e35 Reviewed-by: Toni Saario --- coin/provisioning/common/unix/install-openssl.sh | 13 +++++++------ .../qtci-linux-Debian-11.6-aarch64/09-openssl.sh | 7 +++++++ 2 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 coin/provisioning/qtci-linux-Debian-11.6-aarch64/09-openssl.sh (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index d9b44784..e6b2092b 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" -- cgit v1.2.3