diff options
| author | Konrad Kujawa <konrad.kujawa@qt.io> | 2023-01-30 11:48:33 +0100 |
|---|---|---|
| committer | Konrad Kujawa <konrad.kujawa@qt.io> | 2023-02-10 06:21:57 +0100 |
| commit | 5a1ed71917e3c965df34277a6796241152e8ce8e (patch) | |
| tree | d79e189b4528ff0a0f86ed374e0af583c32cf8a5 /coin | |
| parent | 739cc29b7777bedc70c20dcd83eb5d05033d7bec (diff) | |
| download | qt5-5a1ed71917e3c965df34277a6796241152e8ce8e.tar.gz | |
Set OPENSSL_ROOT_DIR for gRPC unix provisioning script
Pick-to: 6.5
Change-Id: I44fb0f94f183ddc10399c331e8e1a38c533dcf0d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/provisioning/common/unix/install_grpc.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/coin/provisioning/common/unix/install_grpc.sh b/coin/provisioning/common/unix/install_grpc.sh index 0ca8302c..622c2d51 100644 --- a/coin/provisioning/common/unix/install_grpc.sh +++ b/coin/provisioning/common/unix/install_grpc.sh @@ -67,7 +67,7 @@ installPrefix="$HOME/install-grpc-$version" targetDir="$HOME/grpc-$version" targetFile="$targetDir.zip" DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile" -unzip "$targetFile" -d "$HOME" +unzip -q "$targetFile" -d "$HOME" sudo rm "$targetFile" # devtoolset is needed when running configuration @@ -77,10 +77,17 @@ fi if uname -a |grep -q Darwin; then extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11" - extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR SetEnvVar PATH "\$PATH:$installPrefix/bin" fi +# MacOS +if [[ -n "$OPENSSL_DIR" ]]; then + extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR +# Linux +elif [[ -n "$OPENSSL_HOME" ]]; then + extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_HOME +fi + echo "Configuring and building gRPC" buildDir="$HOME/build-grpc-$version" |