From 43f28d68ae95ae6940a8b80e10bf065ddd590ffd Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Fri, 23 Nov 2018 17:14:18 +0100
Subject: [PATCH] fix Jamfile for linking against openssl 1.1+ on windows

---
 Jamfile | 50 +++++++++++++++++---------------------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/Jamfile b/Jamfile
index b81241fcd..13a1b90bf 100644
--- a/Jamfile
+++ b/Jamfile
@@ -568,42 +568,26 @@ lib shell32 : : <name>shell32 ;
 lib gdi32 : : <name>gdi32 ;
 lib z : : <link>shared <name>z ;
 
-lib crypto
-	: # sources
-	: # requirements
-	<target-os>windows
-	<openssl-version>pre1.1
-	<name>libeay32
-	<conditional>@openssl-lib-path
-	: # default-build
-	: # usage-requirements
-	<conditional>@openssl-include-path
-	<library>advapi32
-	<library>user32
-	<library>shell32
-	<library>gdi32
-	;
+# openssl libraries on windows
+alias ssl-deps : advapi32 user32 shell32 gdi32 ;
 
-lib ssl
-	: # sources
-	: # requirements
-	<target-os>windows
-	<openssl-version>pre1.1
-	<name>ssleay32
-	<use>crypto
-	<conditional>@openssl-lib-path
-	: # default-build
-	: # usage-requirments
-	<conditional>@openssl-include-path
-	<library>advapi32
-	<library>user32
-	<library>shell32
-	<library>gdi32
-	;
+# pre OpenSSL 1.1 windows
+lib crypto : ssl-deps : <target-os>windows <openssl-version>pre1.1 <name>libeay32
+	<conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
+lib ssl : ssl-deps : <target-os>windows <openssl-version>pre1.1 <name>ssleay32
+	<use>crypto <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
 
+# OpenSSL 1.1+ windows
+lib crypto : ssl-deps : <target-os>windows <name>libcrypto
+	<conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
+lib ssl : ssl-deps : <target-os>windows <name>libssl <use>crypto
+	<conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
 
-lib crypto : : <name>crypto <use>z <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
-lib ssl : : <name>ssl <use>crypto <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
+# generic OpenSSL
+lib crypto : : <name>crypto <use>z <conditional>@openssl-lib-path : :
+	<conditional>@openssl-include-path ;
+lib ssl : : <name>ssl <use>crypto <conditional>@openssl-lib-path : :
+	<conditional>@openssl-include-path ;
 
 lib dbghelp : : <name>dbghelp ;