From 9a3195570e860aba011cfbcecc0f153afb964b9b Mon Sep 17 00:00:00 2001 From: kleuter Date: Wed, 6 Feb 2019 12:38:29 +0100 Subject: [PATCH] 5.12.1: Do not compile openssl if it's already compiled, no-tests --- 5.12.1/compile_win.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5.12.1/compile_win.pl b/5.12.1/compile_win.pl index 5b6ab1f..4fc8340 100644 --- a/5.12.1/compile_win.pl +++ b/5.12.1/compile_win.pl @@ -28,17 +28,17 @@ printLineToBat ("cd qtbase"); printLineToBat ("if \"%~1\"==\"step2\" goto step2"); # step1: compile openssl and do configure. For some reason, can't continue script execution after configure, have to make step2 - +printLineToBat ("IF EXIST $openssl_dir\\build GOTO OPENSSL_ALREAD_COMPILED"); printLineToBat ("wget --no-check-certificate $openssl_download"); printLineToBat ("7z x openssl-$openssl_version.tar.gz"); printLineToBat ("7z x openssl-$openssl_version.tar"); printLineToBat ("rm openssl-$openssl_version.tar.gz"); printLineToBat ("rm openssl-$openssl_version.tar"); printLineToBat ("cd $openssl_dir"); -# now only release -printLineToBat ("perl Configure VC-$openssl_arch no-asm no-shared --prefix=%cd%\\build --openssldir=%cd%\\build"); +printLineToBat ("perl Configure VC-$openssl_arch no-asm no-shared no-tests --prefix=%cd%\\build --openssldir=%cd%\\build"); printLineToBat ("nmake"); printLineToBat ("nmake install"); +printLineToBat (":OPENSSL_ALREAD_COMPILED"); # go back to qtbase printLineToBat ("cd ..");