Ticket #52824: gnuradio_enable_ctrlport.diff

science/gnuradio/Portfile

@@ -446 +446 @@
 
 }
 
-variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {
-# as of commit 2e691d87 (2014-08-08), all CTRLPORT calls are noops
-# because of an issue with ICE.  So, allow +ctrlport, but it won't do
-# anything until this is fixed.
+variant ctrlport requires cxx11 description {Enable control port enhancements (EXPERIMENTAL)} {
 
-# as of commit 621c086b (2015-04-16), CTRLPORT has been moved to using
-# thrift, which needs debugging when building on OSX. Just disable
-# CTRLPORT for now.
+    # require Thrift and Python Thrift
 
-    configure.args-append -DENABLE_GR_CTRLPORT=OFF
+    depends_lib-append \
+        port:py27-thrift \
+        port:thrift
+
+    # enable configuration arguments for ctrlport and thrift
+
+    configure.args-append \
+        -DENABLE_GR_CTRLPORT=ON \
+        -DENABLE_CTRLPORT_THRIFT=ON
 
 }
 
 if {![variant_isset ctrlport]} {
 
-    configure.args-append -DENABLE_GR_CTRLPORT=OFF
+    configure.args-append \
+        -DENABLE_GR_CTRLPORT=OFF \
+        -DENABLE_CTRLPORT_THRIFT=OFF
 
 }
 
@@ -509 +514 @@
 
 }
 
-variant cxx11 description "Compile using C++11" {
+variant cxx11 description {Compile using C++11} {
 
     # require C++11
 
-    configure.cxxflags-append -std=c++11
-
-    if {${configure.cxx_stdlib} eq "libstdc++"} {
-
-        # *clang* when using libstdc++ do not seem to support C++11;
-        # C++11 support seems to need GCC 4.7+ when using libstdc++;
-        # could use C++0x support on GCC4.[56], but just ignore it since
-        # there are newer compilers already in place as defaults.
+    PortGroup cxx11 1.1
 
-        # Blacklist GCC compilers not supporting C++11 and all CLANG.
-        # This is probably not necessary, but it's good practice.
-
-        compiler.blacklist-append *clang* {*gcc-3*} {*gcc-4.[0-6]}
-
-        # and whitelist those we do want to use. wish there were a better way.
-        # these will be used in the order provided.
-
-        compiler.whitelist macports-gcc-4.9 macports-gcc-4.8 macports-gcc-4.7
-
-    } else {
+    configure.args-append \
+        -DCMAKE_CXX_STANDARD=11
 
-        # using libc++;
-        # Blacklist Clang not supporting C++11 in some form and all GCC.
-        # Just use the cxx11 PortGroup for this specific case.
+    # temporary define until code is fixed in gr fec
 
-        PortGroup cxx11 1.0
+    configure.cxxflags-append \
+        -DBOOST_NO_CXX11_CONSTEXPR \
+        -std=c++11
 
-    }
 }