svn commit: r499093 - in head/comms/gnuradio: . files

[Diane Bruce]

Author: db
Date: Tue Apr 16 14:19:46 2019
New Revision: 499093
URL: https://svnweb.freebsd.org/changeset/ports/499093

Log:
  Unbreak gnuradio due to boost 1.70
  Remove patch needed for cpu affinity which is now not needed

Added:
  head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc   (contents, props changed)
Deleted:
  head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc
Modified:
  head/comms/gnuradio/Makefile

Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile	Tue Apr 16 12:48:05 2019	(r499092)
+++ head/comms/gnuradio/Makefile	Tue Apr 16 14:19:46 2019	(r499093)
@@ -4,7 +4,7 @@ PORTNAME=	gnuradio
 #MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
 # Temporary git version
 DISTVERSION=	3.8.g20190309
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	hamradio at FreeBSD.org
@@ -12,7 +12,6 @@ COMMENT=	Amateur Radio Software defined radio
 
 LICENSE=	GPLv3
 
-BROKEN=		fails to build with boost 1.70, see bug 236601
 BROKEN_aarch64=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
 BROKEN_armv6=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
 BROKEN_armv7=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?

Added: head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc	Tue Apr 16 14:19:46 2019	(r499093)
@@ -0,0 +1,16 @@
+--- gr-blocks/lib/socket_pdu_impl.cc.orig	2019-04-16 13:45:00 UTC
++++ gr-blocks/lib/socket_pdu_impl.cc
+@@ -165,8 +165,11 @@ namespace gr {
+     void
+     socket_pdu_impl::start_tcp_accept()
+     {
+-      tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
+-
++#if (BOOST_VERSION >= 107000)
++	tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay);
++#else
++	tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
++#endif
+       d_acceptor_tcp->async_accept(new_connection->socket(),
+         boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
+           new_connection, boost::asio::placeholders::error));