fix build with boost 1.66.0

This commit is contained in:
rsadowski 2018-01-31 22:29:09 +00:00
parent 5126c24bf7
commit ff0603e97a
6 changed files with 108 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2018/01/14 14:42:18 rpe Exp $
# $OpenBSD: Makefile,v 1.13 2018/01/31 22:29:09 rsadowski Exp $
COMMENT= high-performance and extensible DHCP server engine from ISC
@ -6,7 +6,7 @@ VERSION= 1.2.0
DISTNAME= kea-${VERSION}
PKGNAME= ${DISTNAME:S/-P/pl/}
REVISION= 1
REVISION= 2
SHARED_LIBS += kea-asiodns 0.0 # 0.0
SHARED_LIBS += kea-asiolink 2.0 # 4.0

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_lib_asiolink_io_service_h,v 1.1 2018/01/31 22:29:09 rsadowski Exp $
fix build with boost 1.66
- use io_context instead of io_service
commit 17ed090beb6cefa78e29a95c645eb6da4edf8
Index: src/lib/asiolink/io_service.h
--- src/lib/asiolink/io_service.h.orig
+++ src/lib/asiolink/io_service.h
@@ -11,7 +11,12 @@
namespace boost {
namespace asio {
+#if BOOST_VERSION < 106600
class io_service;
+#else
+ class io_context;
+ typedef io_context io_service;
+#endif
}
}

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_lib_asiolink_tcp_acceptor_h,v 1.1 2018/01/31 22:29:09 rsadowski Exp $
fix build with boost 1.66
- use native_handle() for getting native socket type
commit 17ed090beb6cefa78e29a95c645eb6da4edf8
Index: src/lib/asiolink/tcp_acceptor.h
--- src/lib/asiolink/tcp_acceptor.h.orig
+++ src/lib/asiolink/tcp_acceptor.h
@@ -44,7 +44,11 @@ class TCPAcceptor : public IOSocket { (public)
/// @brief Returns file descriptor of the underlying socket.
virtual int getNative() const final {
+#if BOOST_VERSION < 106600
return (acceptor_->native());
+#else
+ return (acceptor_->native_handle());
+#endif
}
/// @brief Returns protocol of the socket.

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_lib_asiolink_tcp_socket_h,v 1.1 2018/01/31 22:29:09 rsadowski Exp $
fix build with boost 1.66
- use native_handle() for getting native socket type
commit 17ed090beb6cefa78e29a95c645eb6da4edf8
Index: src/lib/asiolink/tcp_socket.h
--- src/lib/asiolink/tcp_socket.h.orig
+++ src/lib/asiolink/tcp_socket.h
@@ -75,7 +75,11 @@ class TCPSocket : public IOAsioSocket<C> { (public)
/// \brief Return file descriptor of underlying socket
virtual int getNative() const {
+#if BOOST_VERSION < 106600
return (socket_.native());
+#else
+ return (socket_.native_handle());
+#endif
}
/// \brief Return protocol of socket

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_lib_asiolink_udp_socket_h,v 1.1 2018/01/31 22:29:09 rsadowski Exp $
fix build with boost 1.66
- use native_handle() for getting native socket type
commit 17ed090beb6cefa78e29a95c645eb6da4edf8
Index: src/lib/asiolink/udp_socket.h
--- src/lib/asiolink/udp_socket.h.orig
+++ src/lib/asiolink/udp_socket.h
@@ -61,7 +61,11 @@ class UDPSocket : public IOAsioSocket<C> { (public)
/// \brief Return file descriptor of underlying socket
virtual int getNative() const {
+#if BOOST_VERSION < 106600
return (socket_.native());
+#else
+ return (socket_.native_handle());
+#endif
}
/// \brief Return protocol of socket

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_lib_asiolink_unix_domain_socket_cc,v 1.1 2018/01/31 22:29:09 rsadowski Exp $
fix build with boost 1.66
- use native_handle() for getting native socket type
commit 17ed090beb6cefa78e29a95c645eb6da4edf8
Index: src/lib/asiolink/unix_domain_socket.cc
--- src/lib/asiolink/unix_domain_socket.cc.orig
+++ src/lib/asiolink/unix_domain_socket.cc
@@ -48,7 +48,11 @@ UnixDomainSocket::UnixDomainSocket(IOService& io_servi
int
UnixDomainSocket::getNative() const {
+#if BOOST_VERSION < 106600
return (impl_->socket_.native());
+#else
+ return (impl_->socket_.native_handle());
+#endif
}
int