<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/8a9b86ec98e3b989f333dc5cb48385f8a713dc11">https://github.com/macports/macports-ports/commit/8a9b86ec98e3b989f333dc5cb48385f8a713dc11</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 8a9b86e gnuradio*: add patch to fix CTRLPORT testing
</span>8a9b86e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8a9b86ec98e3b989f333dc5cb48385f8a713dc11
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Apr 13 13:35:36 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio*: add patch to fix CTRLPORT testing
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + remove unused patch from gnuradio-devel
</span>---
science/gnuradio/Portfile | 20 ++--
science/gnuradio/files/patch-fix_clang.devel.diff | 29 ------
.../files/patch-fix_ctrlport_test.devel.diff | 114 +++++++++++++++++++++
.../files/patch-fix_ctrlport_test.next.diff | 114 +++++++++++++++++++++
.../files/patch-fix_ctrlport_test.release.diff | 114 +++++++++++++++++++++
5 files changed, 356 insertions(+), 35 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 dcd1bc1..e79068e 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;'>@@ -25,7 +25,7 @@ dist_subdir gnuradio
</span> if {${subport} eq ${name}} {
github.setup gnuradio gnuradio 3.7.12.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span> checksums \
rmd160 a2a8ccfaf4ff91d456380357e9e596e188db5953 \
sha256 6c84b58b947d10c1788d81f48c066ecba1c302d7b3eff21b3a102444b39d115b \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,6 +57,7 @@ subport gnuradio-devel {
</span>
github.setup gnuradio gnuradio 67a24278c67d78998c600543637975947bfa381f
version 20180405
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums \
rmd160 a745f6febd37bbfb74164b1bff46bab7f0765849 \
sha256 b6fdded871007c9a8f95121908fec3c431e7e10afbb5175e6a638c2dacca29e0 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +79,7 @@ subport gnuradio-next {
</span>
github.setup gnuradio gnuradio e0beb54aac18de2f1c3f5076213f03bbe096cd59
version 20180305
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span> checksums \
rmd160 5ed1ef2625d32778e1e6170ee80230967bd7e644 \
sha256 51b780e1e62ddfb9780ba9dd78acd196841569cdda4186366e9b681fce8a8cf8 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,6 +108,10 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-fix_clang.release.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix CTRLPORT testing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_ctrlport_test.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif {${subport} eq "gnuradio-devel"} {
# patches for devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,10 +120,9 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-cmake-expand.devel.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to allow COMPILER_ID match
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # with Clang and AppleClang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-fix_clang.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix CTRLPORT testing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_ctrlport_test.devel.diff
</span>
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,6 +137,10 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-fix_clang.next.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix CTRLPORT testing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_ctrlport_test.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
platform darwin 10 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_clang.devel.diff b/science/gnuradio/files/patch-fix_clang.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 911c0ae..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix_clang.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,7 +100,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(WARNING "\nCannot determine the version of the compiler selected to build GNU Radio (GCC : ${CMAKE_CXX_COMPILER}). This build may or not work. We highly recommend using GCC version ${GCC_MIN_VERSION} or more recent.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(COMMAND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CXX_COMPILER} -v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RESULT_VARIABLE _res ERROR_VARIABLE _err
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,7 +137,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_CXX_STANDARD 98)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_CXX_STANDARD 98)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_CXX_STANDARD 98)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -147,7 +147,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_ctrlport_test.devel.diff b/science/gnuradio/files/patch-fix_ctrlport_test.devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ef6a6dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix_ctrlport_test.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,114 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/lib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,21 +44,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc)
</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;'>+-# Setup the include and linker paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Setup globally used include paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${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><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories(
</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><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(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND include_directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${THRIFT_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(ENABLE_CTRLPORT_THRIFT)
</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;'>+ # Include subdirs rather to populate to the sources lists.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,6 +63,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_INCLUDE_SUBDIRECTORY(math)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_INCLUDE_SUBDIRECTORY(controlport)
</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;'>++# Setup CTRLPORT include path, if using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories(${THRIFT_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(ENABLE_CTRLPORT_THRIFT)
</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;'>+ # Setup library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/lib/controlport/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/lib/controlport/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,15 +17,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the Free Software Foundation, Inc., 51 Franklin Street,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Boston, MA 02110-1301, USA.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Keep track of the number of backends ControlPort supports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CTRLPORT_BACKENDS 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add definition so we can compile in ControlPort to the blocks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DGR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories(
</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}
</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;'>+ list(APPEND gnuradio_ctrlport_sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcmanager.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +37,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_selector.cc
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTION(ENABLE_CTRLPORT_THRIFT "Enable ControlPort Thrift support" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,17 +91,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(THRIFT_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(ENABLE_CTRLPORT_THRIFT)
</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;'>+-# Add controlport stuff to gnuradio-runtime
</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;'>+-include_directories(${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Save the number of backends for testing against later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTRLPORT_BACKENDS ${CTRLPORT_BACKENDS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CACHE INTERNAL "Number of ControlPort backends available"
</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;'>+-endif(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/python/blocks/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/python/blocks/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,13 +46,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(GLOB py_qa_test_files "qa_*.py")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Force out the controlport QA tests if we have no backends to use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CTRLPORT_BACKENDS EQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(REMOVE_ITEM py_qa_test_files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding_set.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_ctrlport_probes.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif(CTRLPORT_BACKENDS EQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif(NOT ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach(py_qa_test_file ${py_qa_test_files})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..931417f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,114 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/lib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,21 +44,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc)
</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;'>+-# Setup the include and linker paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Setup globally used include paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${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><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories(
</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><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(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND include_directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${THRIFT_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(ENABLE_CTRLPORT_THRIFT)
</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;'>+ # Include subdirs rather to populate to the sources lists.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,6 +63,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_INCLUDE_SUBDIRECTORY(math)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_INCLUDE_SUBDIRECTORY(controlport)
</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;'>++# Setup CTRLPORT include path, if using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories(${THRIFT_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(ENABLE_CTRLPORT_THRIFT)
</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;'>+ # Setup library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/lib/controlport/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/lib/controlport/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,15 +17,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the Free Software Foundation, Inc., 51 Franklin Street,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Boston, MA 02110-1301, USA.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Keep track of the number of backends ControlPort supports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CTRLPORT_BACKENDS 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add definition so we can compile in ControlPort to the blocks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DGR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories(
</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}
</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;'>+ list(APPEND gnuradio_ctrlport_sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcmanager.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +37,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_selector.cc
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTION(ENABLE_CTRLPORT_THRIFT "Enable ControlPort Thrift support" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,17 +90,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(THRIFT_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(ENABLE_CTRLPORT_THRIFT)
</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;'>+-# Add controlport stuff to gnuradio-runtime
</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;'>+-include_directories(${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Save the number of backends for testing against later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTRLPORT_BACKENDS ${CTRLPORT_BACKENDS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CACHE INTERNAL "Number of ControlPort backends available"
</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;'>+-endif(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/python/blocks/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/python/blocks/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,13 +43,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(GLOB py_qa_test_files "qa_*.py")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Force out the controlport QA tests if we have no backends to use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CTRLPORT_BACKENDS EQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(REMOVE_ITEM py_qa_test_files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding_set.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_ctrlport_probes.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif(CTRLPORT_BACKENDS EQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif(NOT ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach(py_qa_test_file ${py_qa_test_files})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_ctrlport_test.release.diff b/science/gnuradio/files/patch-fix_ctrlport_test.release.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ef6a6dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix_ctrlport_test.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,114 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/lib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,21 +44,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc)
</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;'>+-# Setup the include and linker paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Setup globally used include paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${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><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories(
</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><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(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND include_directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${THRIFT_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(ENABLE_CTRLPORT_THRIFT)
</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;'>+ # Include subdirs rather to populate to the sources lists.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,6 +63,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_INCLUDE_SUBDIRECTORY(math)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_INCLUDE_SUBDIRECTORY(controlport)
</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;'>++# Setup CTRLPORT include path, if using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories(${THRIFT_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(ENABLE_CTRLPORT_THRIFT)
</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;'>+ # Setup library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/lib/controlport/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/lib/controlport/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,15 +17,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the Free Software Foundation, Inc., 51 Franklin Street,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Boston, MA 02110-1301, USA.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Keep track of the number of backends ControlPort supports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CTRLPORT_BACKENDS 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add definition so we can compile in ControlPort to the blocks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DGR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories(
</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}
</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;'>+ list(APPEND gnuradio_ctrlport_sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcmanager.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +37,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_selector.cc
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTION(ENABLE_CTRLPORT_THRIFT "Enable ControlPort Thrift support" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,17 +91,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(THRIFT_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(ENABLE_CTRLPORT_THRIFT)
</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;'>+-# Add controlport stuff to gnuradio-runtime
</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;'>+-include_directories(${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Save the number of backends for testing against later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTRLPORT_BACKENDS ${CTRLPORT_BACKENDS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CACHE INTERNAL "Number of ControlPort backends available"
</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;'>+-endif(ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/python/blocks/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/python/blocks/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,13 +46,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(GLOB py_qa_test_files "qa_*.py")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Force out the controlport QA tests if we have no backends to use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CTRLPORT_BACKENDS EQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(REMOVE_ITEM py_qa_test_files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding_set.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_ctrlport_probes.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif(CTRLPORT_BACKENDS EQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif(NOT ENABLE_GR_CTRLPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach(py_qa_test_file ${py_qa_test_files})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
</span></pre><pre style='margin:0'>
</pre>