svn commit: r459615 - in head/comms/uhd: . files
Michael Reifenberger
mr at FreeBSD.org
Sun Jan 21 16:03:13 UTC 2018
Author: mr
Date: Sun Jan 21 16:03:11 2018
New Revision: 459615
URL: https://svnweb.freebsd.org/changeset/ports/459615
Log:
Try to unbreak the build for boost 1.66
PR: 224087
Added:
head/comms/uhd/files/patch-host_examples_network_relay.cpp (contents, props changed)
head/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp (contents, props changed)
head/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp (contents, props changed)
head/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp (contents, props changed)
Modified:
head/comms/uhd/Makefile
Modified: head/comms/uhd/Makefile
==============================================================================
--- head/comms/uhd/Makefile Sun Jan 21 15:19:42 2018 (r459614)
+++ head/comms/uhd/Makefile Sun Jan 21 16:03:11 2018 (r459615)
@@ -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= bd6e21dc06cfca6f1165b1eba6ddbf5a46dc34
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 \
Added: head/comms/uhd/files/patch-host_examples_network_relay.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/uhd/files/patch-host_examples_network_relay.cpp Sun Jan 21 16:03:11 2018 (r459615)
@@ -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);
Added: head/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp Sun Jan 21 16:03:11 2018 (r459615)
@@ -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
Added: head/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp Sun Jan 21 16:03:11 2018 (r459615)
@@ -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);
+ }
Added: head/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp Sun Jan 21 16:03:11 2018 (r459615)
@@ -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
More information about the svn-ports-all
mailing list