diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:34:28 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:34:28 +0100 |
commit | 485244b016172445aa20bd31fb84fec6b7724cf5 (patch) | |
tree | cf2a40fea5517379e56e624bcb27936873546f1e /coin/provisioning/common/linux/openssl_for_android_linux.sh | |
parent | 3504be0d83cdfb565ee5e3c043c33c54dacbfa54 (diff) | |
parent | 00e31823d35eecfa6ee265b1ccdb563dfe1b905f (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10.1
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.
Change-Id: Ia5d2e6f7079162f571cd7c7994c0f2b3133b1163
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'coin/provisioning/common/linux/openssl_for_android_linux.sh')
-rwxr-xr-x | coin/provisioning/common/linux/openssl_for_android_linux.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index cda41d72..e9f50b87 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -38,6 +38,7 @@ source "${BASH_SOURCE%/*}/../unix/try_catch.sh" source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="1.0.2g" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" @@ -64,7 +65,8 @@ try pushd "$opensslHome" perl Configure shared android || throw $ExceptionConfig - echo "export OPENSSL_ANDROID_HOME=$opensslHome" >> ~/.bashrc + SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" + echo "OpenSSL for Android = $version" >> ~/versions.txt ) catch || { |