aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-04-18 00:50:31 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-04-18 11:25:28 +0200
commit342ccf85b21ca2f306e3d8e064ac5e5eda62f511 (patch)
treee5ffd5743cc1472b9c48dc1bafc9477c075ea2e0
parentfab2decb1c38426dcdd7fa50d7aba58be3cc1480 (diff)
downloadbuildroot-342ccf85b21ca2f306e3d8e064ac5e5eda62f511.tar.gz
buildroot-342ccf85b21ca2f306e3d8e064ac5e5eda62f511.tar.bz2
package/botan: fix build with boost 1.70.0
Fixes: - http://autobuild.buildroot.org/results/ca9dfcfd34365aa1476b718d4897a2e75f6983ac Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/botan/0002-Fix-compat-issue-with-upcoming-Boost-1-70.patch67
1 files changed, 67 insertions, 0 deletions
diff --git a/package/botan/0002-Fix-compat-issue-with-upcoming-Boost-1-70.patch b/package/botan/0002-Fix-compat-issue-with-upcoming-Boost-1-70.patch
new file mode 100644
index 0000000000..bf89e6cfea
--- /dev/null
+++ b/package/botan/0002-Fix-compat-issue-with-upcoming-Boost-1-70.patch
@@ -0,0 +1,67 @@
+From 86df247e4f090f984e050962ed5a4a536ec63b33 Mon Sep 17 00:00:00 2001
+From: Ralf van der Enden <Ralf.vanderEnden@deltares.nl>
+Date: Fri, 5 Apr 2019 14:58:14 +0200
+Subject: [PATCH] boost 1.70 compatibility
+
+Fixes issue #82
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://github.com/randombit/botan/commit/f7148998ace97f2ad3a583685e6ed3c1f3b74c09]
+---
+ src/cli/tls_http_server.cpp | 8 +++++++-
+ src/cli/tls_proxy.cpp | 8 +++++++-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/cli/tls_http_server.cpp b/src/cli/tls_http_server.cpp
+index cc59a71c33..0a6428cd65 100644
+--- a/src/cli/tls_http_server.cpp
++++ b/src/cli/tls_http_server.cpp
+@@ -41,6 +41,12 @@
+
+ #include "credentials.h"
+
++#if BOOST_VERSION >= 107000
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
++#else
++#define GET_IO_SERVICE(s) ((s).get_io_service())
++#endif
++
+ namespace Botan_CLI {
+
+ namespace {
+@@ -435,7 +441,7 @@ class TLS_Asio_HTTP_Server final
+ session::pointer make_session()
+ {
+ return session::create(
+- m_acceptor.get_io_service(),
++ GET_IO_SERVICE(m_acceptor),
+ m_session_manager,
+ m_creds,
+ m_policy);
+diff --git a/src/cli/tls_proxy.cpp b/src/cli/tls_proxy.cpp
+index 49ffbe3766..42ce156b12 100644
+--- a/src/cli/tls_proxy.cpp
++++ b/src/cli/tls_proxy.cpp
+@@ -33,6 +33,12 @@
+
+ #include "credentials.h"
+
++#if BOOST_VERSION >= 107000
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
++#else
++#define GET_IO_SERVICE(s) ((s).get_io_service())
++#endif
++
+ namespace Botan_CLI {
+
+ namespace {
+@@ -370,7 +376,7 @@ class tls_proxy_server final
+ session::pointer make_session()
+ {
+ return session::create(
+- m_acceptor.get_io_service(),
++ GET_IO_SERVICE(m_acceptor),
+ m_session_manager,
+ m_creds,
+ m_policy,