<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/94f9ba79ae77fb3fa9ed89fbf22ce05a2116b6b2">https://github.com/macports/macports-ports/commit/94f9ba79ae77fb3fa9ed89fbf22ce05a2116b6b2</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 94f9ba7 gnuradio: add variants for +logging and +log4cpp.
</span>94f9ba7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 94f9ba79ae77fb3fa9ed89fbf22ce05a2116b6b2
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Aug 23 10:58:11 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio: add variants for +logging and +log4cpp.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Make the new variants the default, since they are that way in 3.8 / next.
</span><span style='display:block; white-space:pre;color:#404040;'> Rev-bump for changes to be in effect.
</span>---
science/gnuradio/Portfile | 77 ++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 66 insertions(+), 11 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 ab7a8d4..4e5b35c 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;'>@@ -25,7 +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:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span> checksums \
rmd160 7c361e19ccacd78f8a1e947b3307f8665d0bc0d2 \
sha256 6f796788606eda4a6b947c627a22f00575c6026464b95e05f897bdafd9a1a4fa
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +56,7 @@ subport gnuradio-devel {
</span>
github.setup gnuradio gnuradio 54e89c6431c249bbe560568d76800fef6a245506
version 20170622
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums \
rmd160 25ad2adc5f76405127344a96033720f74af2b06b \
sha256 8771e47453209d287f655cb3fc99a76c6d7fa1df3c3306365c80dfaaa3cfa9b5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +77,7 @@ subport gnuradio-next {
</span>
github.setup gnuradio gnuradio 99ee660ce3701a33efa1737ae341e5360661f900
version 20170622
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums \
rmd160 6f48be6e86e202a5767e507b0f65b8da100bee78 \
sha256 1c974631dfd32ac67346631122ae2452ed84a43f1b9327ed6676753d12641036
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,8 +181,7 @@ use_parallel_build yes
</span> depends_lib-append \
port:boost \
port:cppunit \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3-single \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:log4cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3-single
</span>
# need matplotlib for polar encoder/decoder, runtime
# only. This is not checked for at configure.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -243,10 +244,6 @@ 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:#ffe0e0;'>-# enable logging
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_GR_LOG=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # try to enable C++11 for older compilers too. for some reason cmake
# doesn't recognize libstdc++ compilers as being c++11 capable, even
# though some are. set this and hope for the best ...
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,11 +272,16 @@ post-destroot {
</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:#e0ffe0;'>+# per user concensus: enable all variants except +ctrlport,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# +performance_counters, +debug, and +universal.
</span>
default_variants +docs +grc +qtgui +wxgui +uhd +wavelet \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- +jack +portaudio +swig +sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +jack +portaudio +swig +sdl +zeromq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "gnuradio" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport} eq "gnuradio-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +logging +log4cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# variants follow
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -593,8 +595,9 @@ if {![variant_isset performance_counters]} {
</span>
variant zeromq description {Install GNU Radio with support for the ZeroMQ lightweight messaging kernel (EXPERIMENTAL)} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # can use cppzmq or cppzmq-devel
</span> depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cppzmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/zmq.hpp:cppzmq
</span>
# pyzmq is not checked for at configure, but is
# required for runtime; so use depends_run.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -613,3 +616,55 @@ if {![variant_isset zeromq]} {
</span> -DENABLE_GR_ZEROMQ=OFF
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "gnuradio-next"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # logging using log4cpp is always enabled on GR next (3.8*).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:log4cpp
</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;'>+ -DLOG4CPP_FOUND=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLOG4CPP_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLOG4CPP_LIBRARIES=${prefix}/lib/liblog4cpp.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # logging is an option on GR release and devel (3.7*).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant logging description {Install GNU Radio with support for logging} {
</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_LOG=ON
</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;'>+ if {![variant_isset logging]} {
</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_LOG=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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant log4cpp requires logging description {Install GNU Radio with support for logging via log4cpp} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset log4cpp]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:log4cpp
</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;'>+ -DLOG4CPP_FOUND=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLOG4CPP_INCLUDE_DIRS=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLOG4CPP_LIBRARIES=${prefix}/lib/liblog4cpp.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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;'>+ -DLOG4CPP_FOUND=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLOG4CPP_INCLUDE_DIRS= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLOG4CPP_LIBRARIES=
</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></pre><pre style='margin:0'>
</pre>