<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/188c987fe97494d605c4b499a916ff101fba06ce">https://github.com/macports/macports-ports/commit/188c987fe97494d605c4b499a916ff101fba06ce</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 188c987 uhd release and devel: fix building with various Boost and Python versions
</span>188c987 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 188c987fe97494d605c4b499a916ff101fba06ce
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Sep 4 16:27:50 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> uhd release and devel: fix building with various Boost and Python versions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + now works with both Boost 1.66.0 and prior, and 1.67.0 and newer, which use different libboost_python ABI naming schemes;
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + make sure Boost is installed with the correct Python variant;
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + rev-bump for changes.
</span>---
science/uhd/Portfile | 73 +++++++++++++----
.../uhd/files/patch-fix-boost-python.devel.diff | 93 ++++++++++++++++++++++
.../uhd/files/patch-fix-boost-python.release.diff | 93 ++++++++++++++++++++++
3 files changed, 243 insertions(+), 16 deletions(-)
<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 ce44ac8..0a236fb 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;'>@@ -6,6 +6,7 @@ PortGroup github 1.0
</span> PortGroup muniversal 1.0
PortGroup cxx11 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
name uhd
categories science comms
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +21,7 @@ if {${subport} eq ${name}} {
</span> Provides the release version, which is typically updated every month or so.
github.setup EttusResearch uhd 3.13.0.2 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> conflicts uhd-devel uhd-39lts
checksums rmd160 0bfeca743efa675241625531b7cada6bdf763a64 \
sha256 6ea0ca6229fcf18ea0ce1269dffcf8cc4b385037cdd65b5d282a8179d3eea916 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +46,12 @@ Provides the release version, which is typically updated every month or so.
</span>
patchfiles-append patch-fix-clang-match.release.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix searching for Boost::Python, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # depends on the version of Boost & which Python. 2 parts: a patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and then reinplace. This is part 1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-boost-python.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
subport uhd-39lts {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +87,7 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced
</span> conflicts uhd uhd-39lts
github.setup EttusResearch uhd 4e084337e685204a0142d1dff9e41b4e03d0b582
version 20180829
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums rmd160 52f000ed0daf858b33a77573d5a0234fe3e9914e \
sha256 844fddb4ac09d2436e1e1c49fca654aecfa2d0be373193ae37a4000f81f538d6 \
size 9456995
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,27 +106,17 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced
</span>
patchfiles-append patch-fix-clang-match.devel.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix searching for Boost::Python, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # depends on the version of Boost & which Python. 2 parts: a patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and then reinplace. This is part 1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-boost-python.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # set the variable UHD_VERSION_DEVEL to TRUE, no matter its current setting
post-patch {
reinplace "s@^SET\(UHD_VERSION_DEVEL\[^\)\]*@SET(UHD_VERSION_DEVEL TRUE@1" \
${worksrcpath}/host/cmake/Modules/UHDVersion.cmake
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python_api \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {enable Python API support (experimental)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${PythonVersionNoDot}-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PYTHON_API=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDot}/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDot}/Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUHD_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDot}/lib/python${PythonVersionWithDot}/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python_api]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_PYTHON_API=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python_api
</span> }
# override the github Portgroup's homepage setting
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,10 +124,24 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced
</span> homepage http://uhd.ettus.com/
if {${subport} ne "uhd-39lts"} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # require a compiler that supports thread_local storage,
# which was introduced in 3.11.0.0.
# see also < https://trac.macports.org/ticket/55980 >
compiler.blacklist-append { clang < 800 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix searching for Boost::Python, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # depends on the version of Boost & which Python. 2 parts: a patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and then reinplace. This is part 2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # need to do this only for +python3X variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${PythonVersionNoDot} ne "27"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PythonVersionNoDot@|${PythonVersionNoDot}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PythonVersionWithDot@|${PythonVersionWithDot}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
depends_lib-append port:boost port:ncurses
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,6 +281,12 @@ set PythonExe "${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDo
</span> configure.args-append \
-DPYTHON_EXECUTABLE=${PythonExe}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${PythonVersionNoDot} eq "27"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_PYTHON3=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_PYTHON3=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # after destroot, have uhd fetch its images into the
# destroot area, so that they are also tracked by MacPorts
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,3 +366,25 @@ variant gpsd description {enable gpsd support} {
</span> if {![variant_isset gpsd]} {
configure.args-append -DENABLE_GPSD=OFF
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne "uhd-39lts"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python_api \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {enable Python API support (experimental)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${PythonVersionNoDot}-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PYTHON_API=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDot}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDot}/Python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUHD_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/${PythonVersionWithDot}/lib/python${PythonVersionWithDot}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost python${PythonVersionNoDot}
</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 python_api]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_PYTHON_API=OFF
</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;'>+ default_variants +python_api
</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;color:#808080;'>diff --git a/science/uhd/files/patch-fix-boost-python.devel.diff b/science/uhd/files/patch-fix-boost-python.devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c15bf16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-fix-boost-python.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,93 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f25fa1f..3b4260c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -286,15 +286,40 @@ ENDIF(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Choose a version of Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</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><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;'>++# Find Boost Version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "Determining Boost Version...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} REQUIRED)
</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 Boost : Optional Component(s)
</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(${Boost_VERSION} VERSION_LESS_EQUAL "106600")
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSE()
</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;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELSE()
</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 python@PythonVersionNoDot@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(BOOST_PYTHON_VERSION @PythonVersionWithDot@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(BOOST_PYTHON_COMPONENT python27)
</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;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Setup Boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Setup Boost : Required Components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</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;'>+@@ -309,7 +334,6 @@ SET(BOOST_REQUIRED_COMPONENTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ serialization
</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;'>+-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;'>+@@ -339,20 +363,25 @@ SET(Boost_ADDITIONAL_VERSIONS
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# NOTE: The next "FIND_PACKAGE" will overwrite certain Boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# variables, but we don't care because their info is already saved in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# various variables that are not overwritten. Also, we want to keep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# the required Boost libraries separate from the optional ones, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# is accompished via separate calls to "FIND_PACKAGE".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#Check to see if the Python version we're looking for exists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++STRING(TOUPPER ${BOOST_PYTHON_COMPONENT} BOOST_PYTHON_COMPONENT_VAR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(BOOST_PYTHON_COMPONENT_FOUND "Boost_${BOOST_PYTHON_COMPONENT_VAR}_FOUND")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(BOOST_PYTHON_COMPONENT_LIBRARY "Boost_${BOOST_PYTHON_COMPONENT_VAR}_LIBRARY")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(BOOST_PYTHON_FOUND ${${BOOST_PYTHON_COMPONENT_FOUND}})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(BOOST_PYTHON_LIBRARY ${${BOOST_PYTHON_COMPONENT_LIBRARY}})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#Check to see if the Python version we're looking for exists
</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:#e0ffe0;'>+-
</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-boost-python.release.diff b/science/uhd/files/patch-fix-boost-python.release.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c15bf16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,93 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f25fa1f..3b4260c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -286,15 +286,40 @@ ENDIF(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Choose a version of Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</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><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;'>++# Find Boost Version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "Determining Boost Version...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} REQUIRED)
</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 Boost : Optional Component(s)
</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(${Boost_VERSION} VERSION_LESS_EQUAL "106600")
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSE()
</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;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELSE()
</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 python@PythonVersionNoDot@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(BOOST_PYTHON_VERSION @PythonVersionWithDot@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(BOOST_PYTHON_COMPONENT python27)
</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;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Setup Boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Setup Boost : Required Components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</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;'>+@@ -309,7 +334,6 @@ SET(BOOST_REQUIRED_COMPONENTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ serialization
</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;'>+-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;'>+@@ -339,20 +363,25 @@ SET(Boost_ADDITIONAL_VERSIONS
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# NOTE: The next "FIND_PACKAGE" will overwrite certain Boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# variables, but we don't care because their info is already saved in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# various variables that are not overwritten. Also, we want to keep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# the required Boost libraries separate from the optional ones, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# is accompished via separate calls to "FIND_PACKAGE".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#Check to see if the Python version we're looking for exists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++STRING(TOUPPER ${BOOST_PYTHON_COMPONENT} BOOST_PYTHON_COMPONENT_VAR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(BOOST_PYTHON_COMPONENT_FOUND "Boost_${BOOST_PYTHON_COMPONENT_VAR}_FOUND")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(BOOST_PYTHON_COMPONENT_LIBRARY "Boost_${BOOST_PYTHON_COMPONENT_VAR}_LIBRARY")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(BOOST_PYTHON_FOUND ${${BOOST_PYTHON_COMPONENT_FOUND}})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(BOOST_PYTHON_LIBRARY ${${BOOST_PYTHON_COMPONENT_LIBRARY}})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#Check to see if the Python version we're looking for exists
</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:#e0ffe0;'>+-
</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></pre><pre style='margin:0'>
</pre>