<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/61b3a7009b98d4e459ea22b4522067e45872682c">https://github.com/macports/macports-ports/commit/61b3a7009b98d4e459ea22b4522067e45872682c</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 61b3a70 uhd: update to 3.14.0.0
</span>61b3a70 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 61b3a7009b98d4e459ea22b4522067e45872682c
</span>Author: Davide Gerhard <rainbow@irh.it>
AuthorDate: Tue Apr 2 09:49:56 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> uhd: update to 3.14.0.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - bump version to 3.14.0.0
</span><span style='display:block; white-space:pre;color:#404040;'> - patch-fix-clang-match.release.diff is not needed on current release
</span><span style='display:block; white-space:pre;color:#404040;'> - rebase patch-fix-boost-python.release.diff and
</span><span style='display:block; white-space:pre;color:#404040;'> patch-host_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;color:#404040;'> - add python37 variant
</span><span style='display:block; white-space:pre;color:#404040;'> - remove python34 and python35 variants
</span><span style='display:block; white-space:pre;color:#404040;'> - bump revision of gnuradio and gr-osmosdr
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58225
</span>---
science/gnuradio/Portfile | 6 +-
science/gr-osmosdr/Portfile | 2 +-
science/uhd/Portfile | 42 ++++++--------
.../uhd/files/patch-fix-boost-python.release.diff | 64 +++++++++++-----------
.../uhd/files/patch-fix-clang-match.release.diff | 31 -----------
.../files/patch-host_CMakeLists.txt.release.diff | 18 +++---
6 files changed, 59 insertions(+), 104 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 07df06a..4e7d6fb 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;'>@@ -23,7 +23,7 @@ dist_subdir gnuradio
</span> if {${subport} eq ${name}} {
github.setup gnuradio gnuradio 3.7.13.4 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span> checksums \
rmd160 150f8ccb6f724e2bdced377f56d36c3810649992 \
sha256 44c987c941b69fcf77d4e9fa7f8039eb8bf82591e8184c431f44351abe6bba3e \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@ subport gnuradio-devel {
</span>
github.setup gnuradio gnuradio 896d1c9da31963ecf5b0d90942c2af51ca998a69
version 20180824
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums rmd160 8ad7fccef7e21ea96356253432f5f13ad61660ed \
sha256 51080fad6f776f8aec1a6c557320c6c64b4c3c3fde3615ca4d43802de65f324f \
size 4425148
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ subport gnuradio-next {
</span> checksums rmd160 e108e3a6da22301cb8ea1f7414b98eb57ef3844e \
sha256 0adf8f6c4fae5fa8513f248fc7d35abd59920a310e073c709d4850a32bad315c \
size 3430840
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
# set the version override string
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-osmosdr/Portfile b/science/gr-osmosdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84c7e89..f80f86e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-osmosdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-osmosdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ maintainers {michaelld @michaelld} openmaintainer
</span>
github.setup osmocom gr-osmosdr 4d83c6067f059b0c5015c3f59f8117bbd361e877
version 20170704
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> checksums rmd160 7be1f9f0663066ffdb04f7f3378aef007b6c00d9 \
sha256 77eb39c4f19f27fac9e3029a01030b9a64168e15adcda7ad3ad9a7b0ecbfdd00 \
size 278330
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/Portfile b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f3a2e5..7eaa60f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,12 +20,12 @@ if {${subport} eq ${name}} {
</span> long_description ${description}: \
Provides the release version, which is typically updated every month or so.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup EttusResearch uhd 3.13.0.2 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup EttusResearch uhd 3.14.0.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> conflicts uhd-devel uhd-39lts
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0bfeca743efa675241625531b7cada6bdf763a64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6ea0ca6229fcf18ea0ce1269dffcf8cc4b385037cdd65b5d282a8179d3eea916 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9419596
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 cf250374c2b1e5eaee0493945b20a4110d1724f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 033021dc43a5a22b045a6fa826a6529af923501ffc72d8692f0cc6e6f9ada497 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12935507
</span>
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +41,6 @@ Provides the release version, which is typically updated every month or so.
</span> patchfiles-append patch-host_CMakeLists.txt.release.diff
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to use "MATCHES" for "Clang" instead of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "STREQUAL", since Clang can be "Clang" or "AppleClang".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix-clang-match.release.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # temporary patch to fix searching for Boost::Python, which
# depends on the version of Boost & which Python. 2 parts: a patch
# and then reinplace. This is part 1.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,35 +229,30 @@ default_variants +docs +examples +libusb +manual +test +manpages +gpsd
</span>
# select Python to use; default to 2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python34 python35 python36 description {Build using Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 python35 python36 description {Build using Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python34 python36 description {Build using Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python34 python35 description {Build using Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python36 python37 description {Build using Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python37 description {Build using Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python27 python36 description {Build using Python 3.7} {}
</span>
if {![variant_isset python27] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37]} {
</span> default_variants +python27
}
if {![variant_isset python27] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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;'>+ ![variant_isset python36] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select one of the variants +python27 , +python36, or +python37 .\n"
</span> return -code error "Invalid variant selection"
}
set PythonVersionNoDot ""
if {[variant_isset python27]} {
set PythonVersionNoDot "27"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PythonVersionNoDot "34"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PythonVersionNoDot "35"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset python36]} {
</span> set PythonVersionNoDot "36"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "37"
</span> }
set PythonVersionWithDot [join [split ${PythonVersionNoDot} ""] "."]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-fix-boost-python.release.diff b/science/uhd/files/patch-fix-boost-python.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c15bf16..42efe9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/files/patch-fix-boost-python.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-fix-boost-python.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f25fa1f..3b4260c 100644
</span> --- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,15 +286,40 @@ ENDIF(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -284,15 +284,40 @@
</span> # Choose a version of Python
########################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTION(ENABLE_PYTHON3 "Enable Python 3. Default is Python 2" OFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SET(BOOST_PYTHON_COMPONENT python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SET(BOOST_PYTHON_VERSION 2.7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IF(${ENABLE_PYTHON3})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(BOOST_PYTHON_COMPONENT python3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(BOOST_PYTHON_VERSION 3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(ENABLE_PYTHON3 "Enable Python 3. Default is Python 2" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(BOOST_PYTHON_COMPONENT python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(BOOST_PYTHON_VERSION 2.7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(${ENABLE_PYTHON3})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(BOOST_PYTHON_COMPONENT python3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(BOOST_PYTHON_VERSION 3)
</span> +
+########################################################################
+# Find Boost Version
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +37,7 @@ index f25fa1f..3b4260c 100644
</span> + SET(BOOST_PYTHON_COMPONENT python27)
+ SET(BOOST_PYTHON_VERSION 2.7)
+ ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span>
+SET(BOOST_OPTIONAL_COMPONENTS ${BOOST_PYTHON_COMPONENT})
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,19 +45,19 @@ index f25fa1f..3b4260c 100644
</span> -# Setup Boost
+# Setup Boost : Required Components
########################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Configuring Boost C++ Libraries...")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -309,7 +334,6 @@ SET(BOOST_REQUIRED_COMPONENTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Configuring Boost C++ Libraries...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -307,7 +332,6 @@
</span> serialization
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--SET(BOOST_OPTIONAL_COMPONENTS ${BOOST_PYTHON_COMPONENT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(MINGW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIST(APPEND BOOST_REQUIRED_COMPONENTS thread_win32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,20 +363,25 @@ SET(Boost_ADDITIONAL_VERSIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Looking for optional Boost components...")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(BOOST_OPTIONAL_COMPONENTS ${BOOST_PYTHON_COMPONENT})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(MINGW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND BOOST_REQUIRED_COMPONENTS thread_win32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,20 +362,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Looking for optional Boost components...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Boost ${BOOST_MIN_VERSION} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})
</span>
+# NOTE: The next "FIND_PACKAGE" will overwrite certain Boost
+# variables, but we don't care because their info is already saved in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,8 +65,8 @@ index f25fa1f..3b4260c 100644
</span> +# the required Boost libraries separate from the optional ones, which
+# is accompished via separate calls to "FIND_PACKAGE".
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Looking for required Boost components...")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Looking for required Boost components...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
</span>
+#Check to see if the Python version we're looking for exists
+STRING(TOUPPER ${BOOST_PYTHON_COMPONENT} BOOST_PYTHON_COMPONENT_VAR)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,17 +75,17 @@ index f25fa1f..3b4260c 100644
</span> +SET(BOOST_PYTHON_FOUND ${${BOOST_PYTHON_COMPONENT_FOUND}})
+SET(BOOST_PYTHON_LIBRARY ${${BOOST_PYTHON_COMPONENT_LIBRARY}})
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include_directories(${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # link_directories(${Boost_LIBRARY_DIRS})
</span>
-#Check to see if the Python version we're looking for exists
<span style='display:block; white-space:pre;background:#ffe0e0;'>--SET(BOOST_PYTHON_FOUND ${Boost_PYTHON_FOUND})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SET(BOOST_PYTHON_LIBRARY ${Boost_PYTHON_LIBRARY})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IF(${ENABLE_PYTHON3})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(BOOST_PYTHON_FOUND ${Boost_PYTHON3_FOUND})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(BOOST_PYTHON_LIBRARY ${Boost_PYTHON3_LIBRARY})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(BOOST_PYTHON_FOUND ${Boost_PYTHON_FOUND})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(BOOST_PYTHON_LIBRARY ${Boost_PYTHON_LIBRARY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(${ENABLE_PYTHON3})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(BOOST_PYTHON_FOUND ${Boost_PYTHON3_FOUND})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(BOOST_PYTHON_LIBRARY ${Boost_PYTHON3_LIBRARY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span> -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Boost libraries: ${Boost_LIBRARIES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Boost libraries: ${Boost_LIBRARIES}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-fix-clang-match.release.diff b/science/uhd/files/patch-fix-clang-match.release.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bd6bdde..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/files/patch-fix-clang-match.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 91679a3..4ea597f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@ IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(WARNING "\nCannot determine the version of the compiler selected to build UHD (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;'>- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og")
</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;'>-@@ -83,7 +83,7 @@ ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(CMAKE_VERSION VERSION_LESS "3.1")
</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_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
</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;'>- IF("${IS_APPLE}" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -231,7 +231,7 @@ SET(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(UHD_RELEASE_MODE "${UHD_RELEASE_MODE}" CACHE STRING "UHD Release Mode")
</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" OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(STRIP_BINARIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-host_CMakeLists.txt.release.diff b/science/uhd/files/patch-host_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dee5744..6d337b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/files/patch-host_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-host_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ab7f41f..06cd1af 100644
</span> --- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -342,8 +342,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Looking for required Boost components...")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -341,8 +341,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Looking for required Boost components...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-link_directories(${Boost_LIBRARY_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include_directories(${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# link_directories(${Boost_LIBRARY_DIRS})
</span>
#Check to see if the Python version we're looking for exists
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(BOOST_PYTHON_FOUND ${Boost_PYTHON_FOUND})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BOOST_PYTHON_FOUND ${Boost_PYTHON_FOUND})
</span></pre><pre style='margin:0'>
</pre>