<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8cf6e38de28bea7cc8b3a3f62dd257924ecb385f">https://github.com/macports/macports-ports/commit/8cf6e38de28bea7cc8b3a3f62dd257924ecb385f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8cf6e38 gnuradio-next: update to gnuradio 51c234b2 (20180626).
</span>8cf6e38 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8cf6e38de28bea7cc8b3a3f62dd257924ecb385f
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jun 29 16:10:09 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio-next: update to gnuradio 51c234b2 (20180626).
</span>---
science/gnuradio/Portfile | 130 +++++++++++++++------
.../files/patch-fix_ctrlport_test.next.diff | 29 +++--
2 files changed, 107 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f7d6789..7e1b5bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,12 +75,12 @@ subport gnuradio-next {
</span> name gnuradio-next
conflicts gnuradio gnuradio-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio d78f7fcd0dadd362fcdc99194da5343a506eb519
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180322
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio 51c234b2103a3981482a66f3c20d45c7de72fb5c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180626
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b93ee22da1b15f711c6bba679ea0700d2f98b749 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 56f64f035c21a8f078e504c29c500a44259c9b44bed3c761f42548f75ada2fb6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3622321
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3fc1861cf3f8c8c2e9b9a8435370244eb727f8eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 00dc58427af1f4f3bb30db9ed743aa29d1ec6b89e987cf3e4d871bcf5ae7fc37 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3629452
</span>
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,6 +148,47 @@ homepage http://gnuradio.org/
</span>
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# set Python version and variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set PythonVersionNoDot ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "gnuradio-next"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # select Python to use; default to 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python27 conflicts python34 python35 python36 description {Build using Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python34 conflicts python27 python35 python36 description {Build using Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python35 conflicts python27 python34 python36 description {Build using Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python36 conflicts python27 python34 python35 description {Build using Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select one of the variants +python27 , +python34 , +python35, or +python36. .\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "27"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "34"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "35"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "36"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for now: release and devel require Python 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "27"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set PythonVersionWithDot [join [split ${PythonVersionNoDot} ""] "."]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig \
port:swig-python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,7 +203,7 @@ depends_test-append \
</span> # need matplotlib for polar encoder/decoder, runtime
# only. This is not checked for at configure.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:py27-matplotlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:py${PythonVersionNoDot}-matplotlib
</span>
# do VPATH (out of source tree) build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,24 +234,24 @@ depends_lib-append path:lib/libvolk.dylib:volk
</span> configure.args-append \
-DENABLE_INTERNAL_VOLK=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# require Python 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# require Python
</span>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${PythonVersionNoDot}
</span>
# these are checked for at configure, then required for
# runtime; so use depends_lib to get both.
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-cheetah
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-cheetah
</span>
# these are not checked for at configure, but are required
# for runtime; so use depends_run.
depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-opengl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-scipy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-opengl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-scipy
</span>
# specify the Python version to use
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,7 +310,7 @@ variant docs description "Install GNU Radio documentation" {
</span> port:xmlto
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-sphinx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-sphinx \
</span> port:texlive-latex
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -295,10 +336,22 @@ variant grc requires swig description "Install GNU Radio Companion" {
</span> # these are checked for at configure, then required
# for runtime; so use depends_lib to get both.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-lxml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pygtk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "gnuradio-next"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-gobject3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-mako \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-lxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pango
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-pygtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-lxml
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {![variant_isset grc]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,7 +376,7 @@ variant qtgui description "Install GNU Radio with support for Qt GUI" {
</span> # runtime; so use depends_lib to get both.
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-pyqt4
</span>
# Requires qwt >= 5.2, so not the "qwt" port. Also requires
# py*-pyqwt which does not compile with qwt >= 6.0; so -have- to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -336,7 +389,7 @@ variant qtgui description "Install GNU Radio with support for Qt GUI" {
</span> # required for runtime; so use depends_run.
depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pyqwt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-pyqwt
</span>
configure.args-append \
-DQWT_INCLUDE_DIRS=${prefix}/include/qwt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -352,7 +405,7 @@ variant qtgui description "Install GNU Radio with support for Qt GUI" {
</span> # either py*-pyqt5 or py*-pyqt5-devel.
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py27-sip/PyQt5:py27-pyqt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:share/py${PythonVersionNoDot}-sip/PyQt5:py${PythonVersionNoDot}-pyqt5
</span>
# Requires qwt >= 6.0, installed for qt5.
# just use the new port that does this.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -379,27 +432,32 @@ if {![variant_isset qtgui]} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wxgui description "Install GNU Radio with support for Wx GUI" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "gnuradio-next"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no wxgui in next!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant wxgui description "Install GNU Radio with support for Wx GUI" {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # wxpython is checked for at configure, then required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for runtime; so use depends_lib to get both.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${wxWidgets.port}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-wxpython-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # wxpython is checked for at configure, then required
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for runtime; so use depends_lib to get both.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_GR_WXGUI=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-wxpython-3.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GR_WXGUI=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset wxgui]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset wxgui]} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_GR_WXGUI=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GR_WXGUI=OFF
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant uhd description "Install GNU Radio with support for UHD" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -523,7 +581,7 @@ variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {
</span> # require Thrift and Python Thrift
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-thrift \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-thrift \
</span> port:thrift
# enable configuration arguments for ctrlport and thrift
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -548,8 +606,8 @@ variant performance_counters description {Enable support for performance counter
</span> # required for runtime; so use depends_run.
depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pygraphviz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-networkx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-pygraphviz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-networkx
</span>
configure.args-append \
-DENABLE_PERFORMANCE_COUNTERS=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -573,7 +631,7 @@ variant zeromq description {Install GNU Radio with support for the ZeroMQ lightw
</span> # required for runtime; so use depends_run.
depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PythonVersionNoDot}-zmq
</span>
configure.args-append \
-DENABLE_GR_ZEROMQ=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_ctrlport_test.next.diff b/science/gnuradio/files/patch-fix_ctrlport_test.next.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 931417f..1fd29c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix_ctrlport_test.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix_ctrlport_test.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,20 @@
</span> --- gnuradio-runtime/lib/CMakeLists.txt.orig
+++ gnuradio-runtime/lib/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,21 +44,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,19 +46,14 @@
</span> ########################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>--# Setup the include and linker paths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Setup globally used include paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Setup the include and linker paths
</span> ########################################################################
-include_directories(${GNURADIO_RUNTIME_INCLUDE_DIRS}
- ${CMAKE_CURRENT_SOURCE_DIR}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_CURRENT_BINARY_DIR}/../include/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_CURRENT_BINARY_DIR}/../include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${VOLK_INCLUDE_DIRS}
</span> - ${Boost_INCLUDE_DIRS}
+include_directories(
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${GNURADIO_RUNTIME_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${CMAKE_CURRENT_BINARY_DIR}/../include/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${GNURADIO_RUNTIME_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_CURRENT_BINARY_DIR}/../include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${Boost_INCLUDE_DIRS}
</span> )
-if(ENABLE_CTRLPORT_THRIFT)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,20 +26,20 @@
</span> ########################################################################
# Include subdirs rather to populate to the sources lists.
########################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,6 +63,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GR_INCLUDE_SUBDIRECTORY(math)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,6 +64,13 @@
</span> GR_INCLUDE_SUBDIRECTORY(controlport)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span> +# Setup CTRLPORT include path, if using
+########################################################################
+if(ENABLE_CTRLPORT_THRIFT)
+ include_directories(${THRIFT_INCLUDE_DIRS})
+endif(ENABLE_CTRLPORT_THRIFT)
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++########################################################################
</span> # Setup library
########################################################################
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND gnuradio_runtime_sources
</span> --- gnuradio-runtime/lib/controlport/CMakeLists.txt.orig
+++ gnuradio-runtime/lib/controlport/CMakeLists.txt
@@ -17,15 +17,18 @@
</pre><pre style='margin:0'>
</pre>