diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2019-06-11 15:40:29 +0300 |
---|---|---|
committer | Simo Fält <simo.falt@qt.io> | 2019-06-13 22:47:35 +0300 |
commit | 644f8b7006737a89bfa171fcc7df15a312d678d7 (patch) | |
tree | 079db68fff58fefea74db8873b7cd180fd2e1442 /coin/provisioning/common | |
parent | 09180d3f9555e48a21c4dc0851f4f43134190d3d (diff) |
Fix openssl 1.1 library configurationsv5.13.0-rc3v5.13.0
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit de415914772b5ced911ec9f04738dab2ec355fc9)
Change-Id: Ifbb5ecc4613319265a3378b60959fffc7301ae46
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'coin/provisioning/common')
-rwxr-xr-x | coin/provisioning/common/unix/install-openssl.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index afc1509e..01a20935 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -59,6 +59,12 @@ if [[ "$os" == "linux" ]]; then ./Configure --prefix="$opensslHome" shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack" make && make install_sw install_ssldirs SetEnvVar "OPENSSL_HOME" "$opensslHome" + if uname -a |grep -q "Ubuntu"; then + echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bash_profile + else + echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bashrc + fi + elif [ "$os" == "macos" ]; then # Below target location has been hard coded into Coin. # QTQAINFRA-1195 |