freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to unbreak the build for boost 1.66

Browse Source 
PR:		224087
This commit is contained in:
Michael Reifenberger
2018-01-21 16:03:11 +00:00
parent e2be731d97
commit a3236d3b89
5 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
comms/uhd/Makefile
View File

@@ -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 \

16
comms/uhd/files/patch-host_examples_network_relay.cpp Normal file
View File

@@ -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);

9
comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp Normal file
View File

@@ -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

9
comms/uhd/files/patch-host_lib_transport_udp_simple.cpp Normal file
View File

@@ -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);
}

9
comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp Normal file
View File

@@ -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