On Sun, Jan 28 2018, Rafael Sadowski <[email protected]> wrote:
[...]
> Thank you both! FreeBSD applied the same patch.
ok jca@
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/kea/Makefile,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 Makefile
> --- Makefile 14 Jan 2018 14:42:18 -0000 1.12
> +++ Makefile 28 Jan 2018 09:12:35 -0000
> @@ -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
> Index: patches/patch-src_lib_asiolink_io_service_h
> ===================================================================
> RCS file: patches/patch-src_lib_asiolink_io_service_h
> diff -N patches/patch-src_lib_asiolink_io_service_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_lib_asiolink_io_service_h 28 Jan 2018 09:12:35
> -0000
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +
> +fix build with boost 1.66
> +- use io_context instead of io_service
> +
> +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
> + }
> + }
> +
> Index: patches/patch-src_lib_asiolink_tcp_acceptor_h
> ===================================================================
> RCS file: patches/patch-src_lib_asiolink_tcp_acceptor_h
> diff -N patches/patch-src_lib_asiolink_tcp_acceptor_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_lib_asiolink_tcp_acceptor_h 28 Jan 2018 09:12:35
> -0000
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +fix build with boost 1.66
> +- use native_handle() for getting native socket type
> +
> +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.
> Index: patches/patch-src_lib_asiolink_tcp_socket_h
> ===================================================================
> RCS file: patches/patch-src_lib_asiolink_tcp_socket_h
> diff -N patches/patch-src_lib_asiolink_tcp_socket_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_lib_asiolink_tcp_socket_h 28 Jan 2018 09:12:35
> -0000
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +fix build with boost 1.66
> +- use native_handle() for getting native socket type
> +
> +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
> Index: patches/patch-src_lib_asiolink_udp_socket_h
> ===================================================================
> RCS file: patches/patch-src_lib_asiolink_udp_socket_h
> diff -N patches/patch-src_lib_asiolink_udp_socket_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_lib_asiolink_udp_socket_h 28 Jan 2018 09:12:35
> -0000
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +fix build with boost 1.66
> +- use native_handle() for getting native socket type
> +
> +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
> Index: patches/patch-src_lib_asiolink_unix_domain_socket_cc
> ===================================================================
> RCS file: patches/patch-src_lib_asiolink_unix_domain_socket_cc
> diff -N patches/patch-src_lib_asiolink_unix_domain_socket_cc
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_lib_asiolink_unix_domain_socket_cc 28 Jan 2018
> 09:12:35 -0000
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +fix build with boost 1.66
> +- use native_handle() for getting native socket type
> +
> +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
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
