<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/41b662b24380542114ab14a95e4ffb9ac9440662">https://github.com/macports/macports-ports/commit/41b662b24380542114ab14a95e4ffb9ac9440662</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 41b662b gnuradio: fix builds for new CppUnit that requires C++11
</span>41b662b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 41b662b24380542114ab14a95e4ffb9ac9440662
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue May 2 13:07:23 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio: fix builds for new CppUnit that requires C++11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patches for all subports that removes the internal GR specification code for which C++ standard is used, so that MacPorts can specify it. Then specify it at C++11.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix the release code in gr-fec to build using C++11 cleanly via a temporary patch that is already integrated into devel and next.
</span>---
science/gnuradio/Portfile | 112 ++++++++++++---------
.../gnuradio/files/patch-CMakeLists.txt.devel.diff | 35 +++++++
.../gnuradio/files/patch-CMakeLists.txt.next.diff | 34 +++++++
.../files/patch-CMakeLists.txt.release.diff | 34 +++++++
...nclude_gnuradio_fec_polar_decoder_common.h.diff | 22 ++++
5 files changed, 192 insertions(+), 45 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 98fbd82..35de143 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;'>@@ -2,9 +2,13 @@
</span>
PortSystem 1.0
PortGroup cmake 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup wxWidgets 1.0
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# require C++11 for cppunit 1.14.0 as of April 13, 2017.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# GNU Radio 3.8 will require C++11 when it is released.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup wxWidgets 1.0
</span> wxWidgets.use wxPython-3.0
name gnuradio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +25,7 @@ dist_subdir gnuradio
</span> if {${subport} eq ${name}} {
github.setup gnuradio gnuradio 3.7.11 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums \
rmd160 7c361e19ccacd78f8a1e947b3307f8665d0bc0d2 \
sha256 6f796788606eda4a6b947c627a22f00575c6026464b95e05f897bdafd9a1a4fa
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +56,7 @@ subport gnuradio-devel {
</span>
github.setup gnuradio gnuradio 082711cc3f7d910e50609695224e7a3c994a4c73
version 20170423
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums \
rmd160 9907c01aec061ec648f4851a553e78c83f8b11f5 \
sha256 cb1b015d22dbc348e363466859ec9b4f3bffe7f1adea36071f542859f9c40468
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +77,7 @@ subport gnuradio-next {
</span>
github.setup gnuradio gnuradio 68eb2afc2128b2fe942a6be48c903dea6b4b4489
version 20160816
<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 cb297ba374c6af5c7fded74a259333e2e171e8eb \
sha256 6c6353f19e5dd4c54edf99a26fef778ce440e10270e498191c13732b02e61d7f
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,18 +106,40 @@ if {${subport} eq "gnuradio"} {
</span> # delete at next release update
patchfiles-append patch-gr-audio_lib_osx_osx_impl.cc.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove explicit setting of the C++ standard internal to GR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # instead allowing MacPorts to decide the setting.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix gr-fec to switch code from 'constexpr' to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # just 'const'; this patch is already integrated upstream, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove with the next release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gr-fec_include_gnuradio_fec_polar_decoder_common.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif {${subport} eq "gnuradio-devel"} {
# patches for devel
patchfiles-append \
patch-cmake-expand.devel.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove explicit setting of the C++ standard internal to GR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # instead allowing MacPorts to decide the setting.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# patches for next
patchfiles-append \
patch-cmake-expand.next.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove explicit setting of the C++ standard internal to GR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # instead allowing MacPorts to decide the setting.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists.txt.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
platform darwin 10 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,31 +195,6 @@ depends_lib-append path:lib/libvolk.dylib:volk
</span> configure.args-append \
-DENABLE_INTERNAL_VOLK=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix residual cmake module install location when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CMAKE_MODULES_DIR does not do the whole trick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # GNU Radio installs cmake files as "Config*.cmake", which has the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # odd behavior of requiring the files to be in a top-level shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cmake directory; for MacPorts' cmake, these are, apparently:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${prefix}/lib:${prefix}/share/cmake . I don't know why ... but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # I do not want cmake files installed into the former, so move
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # them to the latter.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${destroot}${prefix}/lib/cmake]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/lib/cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# per user concensus: enable all variants except +debug and +universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (and, for devel and next: except +ctrlport, +performance_counters, and +zeromq);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +docs +grc +qtgui +wxgui +uhd +wavelet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- +jack +portaudio +swig +sdl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # require Python 2.7
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,6 +222,42 @@ configure.args-append \
</span> -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.7/Python \
-DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# enable logging
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GR_LOG=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# require C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_CXX_STANDARD=11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix residual cmake module install location when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CMAKE_MODULES_DIR does not do the whole trick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GNU Radio installs cmake files as "Config*.cmake", which has the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # odd behavior of requiring the files to be in a top-level shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cmake directory; for MacPorts' cmake, these are, apparently:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ${prefix}/lib:${prefix}/share/cmake . I don't know why ... but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # I do not want cmake files installed into the former, so move
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # them to the latter.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${prefix}/lib/cmake]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/lib/cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share
</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;'>+# per user concensus: enable all variants except +debug and +universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (and, for devel and next: except +ctrlport, +performance_counters, and +zeromq);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +docs +grc +qtgui +wxgui +uhd +wavelet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +jack +portaudio +swig +sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# variants follow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant docs description "Install GNU Radio documentation" {
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,7 +489,7 @@ if {![variant_isset sdl]} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ctrlport requires cxx11 description {Enable control port enhancements (EXPERIMENTAL)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {
</span>
# require Thrift and Python Thrift
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -517,20 +556,3 @@ if {![variant_isset zeromq]} {
</span> -DENABLE_GR_ZEROMQ=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant cxx11 description {Compile using C++11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # require C++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_CXX_STANDARD=11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary define until code is fixed in gr fec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBOOST_NO_CXX11_CONSTEXPR \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -std=c++11
</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;color:#808080;'>diff --git a/science/gnuradio/files/patch-CMakeLists.txt.devel.diff b/science/gnuradio/files/patch-CMakeLists.txt.devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..286c0a9
</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-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,32 +131,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(status "Skipping compiler version check.")
</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;'>+-# Configure C++ and C standards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(CMAKE_VERSION VERSION_LESS "3.1")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</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;'>+- IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
</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;'>+- SET(CMAKE_C_STANDARD 90)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_STANDARD 98)
</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;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Environment setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-CMakeLists.txt.next.diff b/science/gnuradio/files/patch-CMakeLists.txt.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a462878
</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-CMakeLists.txt.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2017-05-01 15:36:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2017-05-01 15:36:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,31 +56,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
</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 C/C++ standard for all targets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# NOTE: Starting with cmake v3.1 this should be used:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# set(CMAKE_C_STANDARD 90)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# set(CMAKE_CXX_STANDARD 98)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</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;'>+-IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
</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 cmake policies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This will suppress developer warnings during the cmake process that can occur
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if a newer cmake version than the minimum is used.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-CMakeLists.txt.release.diff b/science/gnuradio/files/patch-CMakeLists.txt.release.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5404534
</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-CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2017-05-01 15:28:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2017-05-01 15:28:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,31 +56,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
</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 C/C++ standard for all targets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# NOTE: Starting with cmake v3.1 this should be used:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# set(CMAKE_C_STANDARD 90)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# set(CMAKE_CXX_STANDARD 98)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</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;'>+-IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
</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 cmake policies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This will suppress developer warnings during the cmake process that can occur
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if a newer cmake version than the minimum is used.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-gr-fec_include_gnuradio_fec_polar_decoder_common.h.diff b/science/gnuradio/files/patch-gr-fec_include_gnuradio_fec_polar_decoder_common.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c8a8604
</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-gr-fec_include_gnuradio_fec_polar_decoder_common.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-fec/include/gnuradio/fec/polar_decoder_common.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-fec/include/gnuradio/fec/polar_decoder_common.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,10 +28,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/fec/generic_decoder.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gnuradio/fec/polar_common.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BOOST_CONSTEXPR_OR_CONST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define BOOST_CONSTEXPR_OR_CONST const
</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;'>+ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace fec {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace code {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool set_frame_size(unsigned int frame_size){return false;};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const float D_LLR_FACTOR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int d_frozen_bit_counter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ protected:
</span></pre><pre style='margin:0'>
</pre>