diff options
| author | Michael Reifenberger <mr@FreeBSD.org> | 2018-01-21 16:03:11 +0000 |
|---|---|---|
| committer | Michael Reifenberger <mr@FreeBSD.org> | 2018-01-21 16:03:11 +0000 |
| commit | a3236d3b89ad7966a4aef2de2ed1575f313a63e2 (patch) | |
| tree | a49d26f02002f5d00a22af3dc44c83812402e547 | |
| parent | Update to upstream version 3.17 (diff) | |
Try to unbreak the build for boost 1.66
PR: 224087
Notes
Notes:
svn path=/head/; revision=459615
5 files changed, 44 insertions, 3 deletions
diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile index fe949abd5464..7fda63c6696e 100644 --- a/comms/uhd/Makefile +++ b/comms/uhd/Makefile @@ -2,8 +2,7 @@ PORTNAME= uhd PORTVERSION= 3.10.2.0 -PORTREVISION= 1 -#PORTREVISION= 4 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= http://files.ettus.com/binaries/images/ DISTFILES= ${IMAGE_FILE} @@ -25,7 +24,6 @@ GH_TAGNAME= bd6e21dc06cfca6f1165b1eba6ddbf5a46dc343c CONFLICTS= usrp-[0-9]* -BROKEN= fails to build with boost 1.66, see bug 224087 BROKEN_powerpc64= fails to link: undefined reference to boost function USES= compiler:c++0x cmake:outsource ncurses pkgconfig \ diff --git a/comms/uhd/files/patch-host_examples_network_relay.cpp b/comms/uhd/files/patch-host_examples_network_relay.cpp new file mode 100644 index 000000000000..3bc737bef508 --- /dev/null +++ b/comms/uhd/files/patch-host_examples_network_relay.cpp @@ -0,0 +1,16 @@ +--- host/examples/network_relay.cpp.orig 2017-12-17 19:37:02.232333000 +0000 ++++ host/examples/network_relay.cpp 2017-12-17 19:37:35.331222000 +0000 +@@ -128,5 +128,5 @@ + std::vector<char> buff(insane_mtu); + while (not boost::this_thread::interruption_requested()){ +- if (wait_for_recv_ready(_server_socket->native())){ ++ if (wait_for_recv_ready(_server_socket->native_handle())){ + boost::mutex::scoped_lock lock(_endpoint_mutex); + const size_t len = _server_socket->receive_from(asio::buffer(&buff.front(), buff.size()), _endpoint); +@@ -154,5 +154,5 @@ + std::vector<char> buff(insane_mtu); + while (not boost::this_thread::interruption_requested()){ +- if (wait_for_recv_ready(_client_socket->native())){ ++ if (wait_for_recv_ready(_client_socket->native_handle())){ + const size_t len = _client_socket->receive(asio::buffer(&buff.front(), buff.size())); + boost::mutex::scoped_lock lock(_endpoint_mutex); diff --git a/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp b/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp new file mode 100644 index 000000000000..0b00e14f0a87 --- /dev/null +++ b/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp @@ -0,0 +1,9 @@ +--- host/lib/transport/tcp_zero_copy.cpp.orig 2017-12-17 19:39:49.890757000 +0000 ++++ host/lib/transport/tcp_zero_copy.cpp 2017-12-17 19:40:36.125127000 +0000 +@@ -155,5 +155,5 @@ + _socket.reset(new asio::ip::tcp::socket(_io_service)); + _socket->connect(receiver_endpoint); +- _sock_fd = _socket->native(); ++ _sock_fd = _socket->native_handle(); + + //packets go out ASAP diff --git a/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp b/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp new file mode 100644 index 000000000000..7bc6bf3598aa --- /dev/null +++ b/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp @@ -0,0 +1,9 @@ +--- host/lib/transport/udp_simple.cpp.orig 2017-12-17 19:40:02.609104000 +0000 ++++ host/lib/transport/udp_simple.cpp 2017-12-17 19:40:47.660730000 +0000 +@@ -57,5 +57,5 @@ + + size_t recv(const asio::mutable_buffer &buff, double timeout){ +- if (not wait_for_recv_ready(_socket->native(), timeout)) return 0; ++ if (not wait_for_recv_ready(_socket->native_handle(), timeout)) return 0; + return _socket->receive_from(asio::buffer(buff), _recv_endpoint); + } diff --git a/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp b/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp new file mode 100644 index 000000000000..b2608b698be0 --- /dev/null +++ b/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp @@ -0,0 +1,9 @@ +--- host/lib/transport/udp_zero_copy.cpp.orig 2017-12-17 16:25:59.637675000 +0100 ++++ host/lib/transport/udp_zero_copy.cpp 2017-12-17 16:26:12.713784000 +0100 +@@ -191,5 +191,5 @@ + _socket->open(asio::ip::udp::v4()); + _socket->connect(receiver_endpoint); +- _sock_fd = _socket->native(); ++ _sock_fd = _socket->native_handle(); + + //allocate re-usable managed receive buffers |