<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/fac6cca0375a1ec7bbff7422443df1e63a05f17d">https://github.com/macports/macports-ports/commit/fac6cca0375a1ec7bbff7422443df1e63a05f17d</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 fac6cca gnuradio*: enable +ctrlport
</span>fac6cca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fac6cca0375a1ec7bbff7422443df1e63a05f17d
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Mar 8 12:49:22 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> gnuradio*: enable +ctrlport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fix +cxx11 to work, since thrift code requires c++11.
</span><span style='display:block; white-space:pre;color:#404040;'> Addresses ticket https://trac.macports.org/ticket/52824 .
</span>---
science/gnuradio/Portfile | 56 +++++++++++++++++++----------------------------
1 file changed, 22 insertions(+), 34 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 dff4309..d256c21 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;'>@@ -446,22 +446,27 @@ if {![variant_isset sdl]} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# as of commit 2e691d87 (2014-08-08), all CTRLPORT calls are noops
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# because of an issue with ICE. So, allow +ctrlport, but it won't do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# anything until this is fixed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ctrlport requires cxx11 description {Enable control port enhancements (EXPERIMENTAL)} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# as of commit 621c086b (2015-04-16), CTRLPORT has been moved to using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# thrift, which needs debugging when building on OSX. Just disable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# CTRLPORT for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # require Thrift and Python Thrift
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_GR_CTRLPORT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-thrift \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:thrift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # enable configuration arguments for ctrlport and thrift
</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;'>+ -DENABLE_GR_CTRLPORT=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_CTRLPORT_THRIFT=ON
</span>
}
if {![variant_isset ctrlport]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_GR_CTRLPORT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GR_CTRLPORT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_CTRLPORT_THRIFT=OFF
</span>
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -509,36 +514,19 @@ if {![variant_isset zeromq]} {
</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:#e0ffe0;'>+variant cxx11 description {Compile using C++11} {
</span>
# require C++11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # *clang* when using libstdc++ do not seem to support C++11;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # C++11 support seems to need GCC 4.7+ when using libstdc++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # could use C++0x support on GCC4.[56], but just ignore it since
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # there are newer compilers already in place as defaults.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cxx11 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Blacklist GCC compilers not supporting C++11 and all CLANG.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is probably not necessary, but it's good practice.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append *clang* {*gcc-3*} {*gcc-4.[0-6]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and whitelist those we do want to use. wish there were a better way.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # these will be used in the order provided.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist macports-gcc-4.9 macports-gcc-4.8 macports-gcc-4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</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:#ffe0e0;'>- # using libc++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Blacklist Clang not supporting C++11 in some form and all GCC.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Just use the cxx11 PortGroup for this specific case.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary define until code is fixed in gr fec
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBOOST_NO_CXX11_CONSTEXPR \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
</pre><pre style='margin:0'>
</pre>