diff --git a/CHANGELOG.md b/CHANGELOG.md index 25cda0b3..f29c5c35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Version 234: + +* Don't link to OpenSSL needlessly (bjam) + +-------------------------------------------------------------------------------- + Version 233: * Check __ANDROID__ instead diff --git a/Jamfile b/Jamfile index 56994a53..8473f44f 100644 --- a/Jamfile +++ b/Jamfile @@ -76,6 +76,29 @@ lib static_beast msvc:_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING windows:_WIN32_WINNT=0x0601 static + : usage-requirements + BOOST_BEAST_SPLIT_COMPILATION + BOOST_ASIO_SEPARATE_COMPILATION + BOOST_ASIO_NO_DEPRECATED=1 + BOOST_ASIO_DISABLE_BOOST_ARRAY=1 + BOOST_ASIO_DISABLE_BOOST_BIND=1 + BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1 + BOOST_ASIO_DISABLE_BOOST_REGEX=1 + BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 + msvc-14.1:"/permissive-" + msvc:_SCL_SECURE_NO_WARNINGS=1 + msvc:_CRT_SECURE_NO_WARNINGS=1 + msvc:_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING + msvc:_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING + windows:_WIN32_WINNT=0x0601 + ; +lib static_ssl_asio + : test/lib_ssl.cpp + : requirements + static + static_beast + [ ac.check-library /boost/beast//ssl : /boost/beast//ssl/shared : no ] + [ ac.check-library /boost/beast//crypto : /boost/beast//crypto/shared : no ] ; project /boost/beast @@ -84,14 +107,11 @@ project /boost/beast ./test/extras/include /boost/coroutine//boost_coroutine /boost/filesystem//boost_filesystem - #static_asio static_beast /boost//headers multi on shared - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto BOOST_ALL_NO_LIB=1 BOOST_BEAST_SPLIT_COMPILATION BOOST_ASIO_SEPARATE_COMPILATION diff --git a/example/advanced/server-flex/Jamfile b/example/advanced/server-flex/Jamfile index 52fe55d3..06f6d5fe 100644 --- a/example/advanced/server-flex/Jamfile +++ b/example/advanced/server-flex/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe advanced-server-flex : diff --git a/example/http/client/async-ssl/Jamfile b/example/http/client/async-ssl/Jamfile index 3cabd04f..e7519e1a 100644 --- a/example/http/client/async-ssl/Jamfile +++ b/example/http/client/async-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe http-client-async-ssl : diff --git a/example/http/client/coro-ssl/Jamfile b/example/http/client/coro-ssl/Jamfile index 24904127..ec9bbfc4 100644 --- a/example/http/client/coro-ssl/Jamfile +++ b/example/http/client/coro-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe http-client-coro-ssl : diff --git a/example/http/client/sync-ssl/Jamfile b/example/http/client/sync-ssl/Jamfile index f2726f4c..c32f9ee2 100644 --- a/example/http/client/sync-ssl/Jamfile +++ b/example/http/client/sync-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe http-client-sync-ssl : diff --git a/example/http/server/async-ssl/Jamfile b/example/http/server/async-ssl/Jamfile index baeccc20..9eb0693f 100644 --- a/example/http/server/async-ssl/Jamfile +++ b/example/http/server/async-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe http-server-async-ssl : diff --git a/example/http/server/coro-ssl/Jamfile b/example/http/server/coro-ssl/Jamfile index 2cc5c914..6cd1e3da 100644 --- a/example/http/server/coro-ssl/Jamfile +++ b/example/http/server/coro-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe http-server-coro-ssl : diff --git a/example/http/server/flex/Jamfile b/example/http/server/flex/Jamfile index 5f6ae1bf..49a92999 100644 --- a/example/http/server/flex/Jamfile +++ b/example/http/server/flex/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe http-server-flex : diff --git a/example/http/server/stackless-ssl/Jamfile b/example/http/server/stackless-ssl/Jamfile index 33d57e9b..1c5e5258 100644 --- a/example/http/server/stackless-ssl/Jamfile +++ b/example/http/server/stackless-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe http-server-stackless-ssl : diff --git a/example/http/server/sync-ssl/Jamfile b/example/http/server/sync-ssl/Jamfile index d438549e..c7afe3b3 100644 --- a/example/http/server/sync-ssl/Jamfile +++ b/example/http/server/sync-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe http-server-sync-ssl : diff --git a/example/websocket/client/async-ssl/Jamfile b/example/websocket/client/async-ssl/Jamfile index d9f3ad78..5fd8bb43 100644 --- a/example/websocket/client/async-ssl/Jamfile +++ b/example/websocket/client/async-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe websocket-client-async-ssl : diff --git a/example/websocket/client/coro-ssl/Jamfile b/example/websocket/client/coro-ssl/Jamfile index f6d895d6..f9ecdd08 100644 --- a/example/websocket/client/coro-ssl/Jamfile +++ b/example/websocket/client/coro-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe websocket-client-coro-ssl : diff --git a/example/websocket/client/sync-ssl/Jamfile b/example/websocket/client/sync-ssl/Jamfile index 010703dc..6beec885 100644 --- a/example/websocket/client/sync-ssl/Jamfile +++ b/example/websocket/client/sync-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe websocket-client-sync-ssl : diff --git a/example/websocket/server/async-ssl/Jamfile b/example/websocket/server/async-ssl/Jamfile index 78cb6700..b3a7b7cd 100644 --- a/example/websocket/server/async-ssl/Jamfile +++ b/example/websocket/server/async-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe websocket-server-async-ssl : diff --git a/example/websocket/server/coro-ssl/Jamfile b/example/websocket/server/coro-ssl/Jamfile index 1509f072..3a0fede6 100644 --- a/example/websocket/server/coro-ssl/Jamfile +++ b/example/websocket/server/coro-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe websocket-server-coro-ssl : diff --git a/example/websocket/server/stackless-ssl/Jamfile b/example/websocket/server/stackless-ssl/Jamfile index 7e2e8c4c..2ae1f36c 100644 --- a/example/websocket/server/stackless-ssl/Jamfile +++ b/example/websocket/server/stackless-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe websocket-server-stackless-ssl : diff --git a/example/websocket/server/sync-ssl/Jamfile b/example/websocket/server/sync-ssl/Jamfile index 88074c91..6fb18c96 100644 --- a/example/websocket/server/sync-ssl/Jamfile +++ b/example/websocket/server/sync-ssl/Jamfile @@ -11,8 +11,7 @@ import ac ; project : requirements - [ ac.check-library /boost/beast//ssl : /boost/beast//ssl : no ] - /boost/beast//crypto + [ ac.check-library /boost/beast//static_ssl_asio : /boost/beast//static_ssl_asio : no ] ; exe websocket-server-sync-ssl : diff --git a/test/Jamfile b/test/Jamfile index ebe05f33..0ba86559 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -24,6 +24,7 @@ project /boost/beast/test BOOST_BEAST_ALLOW_DEPRECATED BOOST_BEAST_TESTS BOOST_ASIO_SEPARATE_COMPILATION + /boost/beast//static_ssl_asio ; path-constant ZLIB_SOURCES : diff --git a/test/lib_beast.cpp b/test/lib_beast.cpp index 1cf5d5a8..489284f9 100644 --- a/test/lib_beast.cpp +++ b/test/lib_beast.cpp @@ -12,7 +12,6 @@ // BOOST_ASIO_SEPARATE_COMPILATION for asio #include -#include // BOOST_BEAST_SPLIT_COMPILATION for beast #include diff --git a/test/lib_ssl.cpp b/test/lib_ssl.cpp new file mode 100644 index 00000000..16710878 --- /dev/null +++ b/test/lib_ssl.cpp @@ -0,0 +1,15 @@ +// +// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com) +// +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +// +// Official repository: https://github.com/boostorg/beast +// + +// This file is used to build a static library with +// asio and beast definitions, to reduce compilation time. + +// BOOST_ASIO_SEPARATE_COMPILATION for asio::ssl + +#include