<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/df61464e10cfc6ede084081aabc8ecc8a2656243">https://github.com/macports/macports-ports/commit/df61464e10cfc6ede084081aabc8ecc8a2656243</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit df61464e10cfc6ede084081aabc8ecc8a2656243
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri Apr 10 14:00:40 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gr-baz: update commit to 937834ce and move to GNURadio 3.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - update commit to 937834ce
</span><span style='display:block; white-space:pre;color:#404040;'> - support gnuradio 3.8 and create subport for GR 3.7
</span>---
science/gr-baz/Portfile | 202 +++++++++++++----------
science/gr-baz/files/cmakelists-3.8.txt.patch | 13 ++
science/gr-baz/files/patch-fix_boost_1.68.0.diff | 13 --
3 files changed, 125 insertions(+), 103 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-baz/Portfile b/science/gr-baz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e3de1cfd0ee..1e71f1355ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-baz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-baz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,141 +1,163 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
<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;'>-github.setup balint256 gr-baz 3cedf4bc261e01043daab66c70321889df4f701d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20181012
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 71a8dfad14f9f31c8ac7c27173e445d8f34192d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 17dfc144267a2f53e7ae0fc67c708287b9d5b02390d5934509daf0c642253be6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 511866
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# allow gr-baz to work with both gnuradio and gnuradio-devel ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ... but not with gnuradio-next
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid port dependency: gnuradio-next"
</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;'>-homepage http://wiki.spench.net/wiki/Gr-baz
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+name gr-baz
</span> categories science comms
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span> maintainers {michaelld @michaelld} openmaintainer
description Provides augmented functionality (blocks, GRC definitions, apps, etc) for GNU Radio.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://wiki.spench.net/wiki/Gr-baz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup balint256 gr-baz 937834ce3520b730277328d8e0cdebb3f2b1aafc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20200409-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 62c7e8c1c62000b3bf8f7dee8b4ee0bbde7bc1b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6cfb84fc38046f2429e679a9429bec8b404deb955f4cceecb33f17dc4d73110a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 516543
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libvolk.dylib:volk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_test-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cppunit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix gnuradio version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmakelists-3.8.txt.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# for docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts gr37-baz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:doxygen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libgnuradio-runtime.dylib:gnuradio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions { 3.6 3.7 3.8 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant +python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy -force ${worksrcpath}/CMakeLists-3.8.txt ${worksrcpath}/CMakeLists.txt
</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;'>+subport gr37-baz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name gr37-baz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts gr-baz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary fix, for Boost 1.68.0 compatibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnuradio37
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix_boost_1.68.0.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions { 2.7 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant +python27
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# do VPATH (out of source tree) build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy -force ${worksrcpath}/CMakeLists-3.7.txt ${worksrcpath}/CMakeLists.txt
</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:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Define the available variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_no_dot [join [split ${py_ver} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set variant_line {variant python${py_ver_no_dot} description "Build with python ${py_ver} support"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach py_over ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${py_ver} == ${py_over} } { continue }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_over_no_dot [join [split ${py_over} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append variant_line " conflicts python${py_over_no_dot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append variant_line { { } }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval $variant_line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${py_ver_no_dot}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${default_python_variant} != "+python${py_ver_no_dot}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant ""
</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:#ffe0e0;'>-# remove top-level library path, such that internal libraries are used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# instead of any already-installed ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set default python variant if not selected
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${default_python_variant} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append "${default_python_variant}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# If a python variant is enabled, activate it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set active_python_version ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set active_python_version_no_dot ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_no_dot [join [split ${py_ver} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${py_ver_no_dot}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set active_python_version ${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set active_python_version_no_dot ${py_ver_no_dot}
</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:#ffe0e0;'>-# specify the Python dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cppunit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-python
</span>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libvolk.dylib:volk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${active_python_version_no_dot}
</span>
# specify the Python version to use
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_framework_dir ${frameworks_dir}/Python.framework/Versions/${active_python_version}
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.7/Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${python_framework_dir}/bin/python${active_python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${python_framework_dir}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${python_framework_dir}/Python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGR_PYTHON_DIR=${python_framework_dir}/lib/python${active_python_version}/site-packages
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# enable all variants except +debug and +universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cppunit
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +uhd +rtl +armadillo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUHD_INCLUDE_DIRS= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUHD_LIBRARIES= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBUSB_INCLUDE_DIR= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBUSB_LIBRARIES= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DARMADILLO_INCLUDE_DIR= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DARMADILLO_LIBRARY=
</span>
variant uhd description "Install ${name} with support for UHD" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # allow uhd or uhd-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append \
path:lib/libuhd.dylib:uhd
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUHD_INCLUDE_DIRS= \
</span> -DUHD_INCLUDE_DIRS=${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUHD_LIBRARIES=${prefix}/lib/libuhd.dylib
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUHD_LIBRARIES= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUHD_LIBRARIES=${prefix}/lib/libuhd.dylib
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset uhd]} {
</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;'>- -DUHD_INCLUDE_DIRS= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUHD_LIBRARIES=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
variant rtl description "Install ${name} with support for RTL SDR hardware (via libusb)" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append path:lib/libusb-1.0.dylib:libusb
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBUSB_INCLUDE_DIR=${prefix}/include/libusb-1.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBUSB_LIBRARIES=${prefix}/lib/libusb-1.0.dylib
</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;'>-if {![variant_isset rtl]} {
</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:#e0ffe0;'>+ configure.args-replace \
</span> -DLIBUSB_INCLUDE_DIR= \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBUSB_LIBRARIES=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBUSB_INCLUDE_DIR=${prefix}/include/libusb-1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBUSB_LIBRARIES= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBUSB_LIBRARIES=${prefix}/lib/libusb-1.0.dylib
</span> }
variant armadillo description "Install ${name} with support for MUSIC DOA estimator block (via armadillo)" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:armadillo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DARMADILLO_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DARMADILLO_LIBRARY=${prefix}/lib/libarmadillo.dylib
</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;'>-if {![variant_isset armadillo]} {
</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:#e0ffe0;'>+ configure.args-replace \
</span> -DARMADILLO_INCLUDE_DIR= \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DARMADILLO_LIBRARY=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DARMADILLO_INCLUDE_DIR=${prefix}/include
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DARMADILLO_LIBRARY= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DARMADILLO_LIBRARY=${prefix}/lib/libarmadillo.dylib
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# enable all variants except +debug and +universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +uhd +rtl +armadillo
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-baz/files/cmakelists-3.8.txt.patch b/science/gr-baz/files/cmakelists-3.8.txt.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..824dcc19ea0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-baz/files/cmakelists-3.8.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists-3.8.txt b/CMakeLists-3.8.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 48bc59d..eab01d1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists-3.8.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists-3.8.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(Gnuradio "3.9" REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(Gnuradio "3.8" REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(GrVersion)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(GrPlatform) #define LIB_SUFFIX
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-baz/files/patch-fix_boost_1.68.0.diff b/science/gr-baz/files/patch-fix_boost_1.68.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8b2d17e60a4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-baz/files/patch-fix_boost_1.68.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/baz_burster.cc b/lib/baz_burster.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 39d4d44..c106a5c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/baz_burster.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/baz_burster.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,7 +222,7 @@ fprintf(stderr, "[%s<%li>] updated time\n", name().c_str(), unique_id());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (d_config.sample_interval)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- limit /= (double)d_config.sample_rate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (diff >= boost::posix_time::microseconds(limit * 1e6))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (diff >= boost::posix_time::microseconds(long(limit * 1e6)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //if (d >= limit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //fprintf(stderr, "[%s<%i>] host elapsed %f\n", name().c_str(), unique_id(), ((float)diff.ticks() / (float)d_system_time_ticks_per_second));
</span></pre><pre style='margin:0'>
</pre>