diff options
author | Juha Karjalainen <juha.karjalainen@qt.io> | 2018-11-01 12:23:34 +0200 |
---|---|---|
committer | Heikki Halmet <heikki.halmet@qt.io> | 2019-05-22 15:34:04 +0300 |
commit | 3e838f2a34d0c1538535bd184aa12681497c8a38 (patch) | |
tree | 6178fff1207cbee295cf439fd39689aec761648b /coin/provisioning/common/linux | |
parent | b7c0e2db784b0fb392d61a64ab0c2243df2acf6d (diff) |
Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.
For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests
Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'coin/provisioning/common/linux')
-rwxr-xr-x | coin/provisioning/common/linux/openssl_for_android_linux.sh | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 09d0b6d5..d833975f 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -35,32 +35,38 @@ # This script install OpenSSL from sources. # Requires GCC and Perl to be in PATH. - +set -ex # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.0.2p" +exports_file="/tmp/export.sh" +# source previously made environmental variables. +if uname -a |grep -q "Ubuntu"; then + # shellcheck disable=SC1090 + grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file + rm -rf "$exports_file" +else + # shellcheck disable=SC1090 + grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file + rm -rf "$exports_file" +fi + +version="1.1.1b" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -installFolder="/home/qt/" -sha="f34b5322e92415755c7d58bf5d0d5cf37666382c" -# Until every VM doing Linux Android builds have provisioned the env variable -# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. -# QTQAINFRA-1436 -opensslHome="${installFolder}openssl-1.0.2" - +sha="e9710abf5e95c48ebf47991b10cbb48c09dae102" +opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" +mkdir -p "${HOME}/openssl/android/" +tar -xzf "$targetFile" -C "${HOME}/openssl/android/" -tar -xzf "$targetFile" -C "$installFolder" -# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) -mv "${opensslHome}p" "${opensslHome}" -pushd "$opensslHome" - -echo "Running configure" -perl Configure shared android +TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin +cd "$opensslHome" +PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm +PATH=$TOOLCHAIN:$PATH CC=clang make build_generated SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" |