<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/f2fbc5bf19f6504d018c5c92f2424c0f21939377">https://github.com/macports/macports-ports/commit/f2fbc5bf19f6504d018c5c92f2424c0f21939377</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f2fbc5bf19f6504d018c5c92f2424c0f21939377
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri Apr 10 20:18:36 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gr-gfdm: support gnuradio 3.8 and create subport for GR 3.7
</span>---
science/gr-gfdm/Portfile | 153 ++++++++++++++-------
...patch-fix_build.diff => patch-fix_build37.diff} | 48 +++----
science/gr-gfdm/files/patch-fix_build38.diff | 42 ++++++
3 files changed, 166 insertions(+), 77 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-gfdm/Portfile b/science/gr-gfdm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0984a21724d..e73f454aa5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-gfdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-gfdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,10 @@
</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;'>-github.setup kit-cel gr-gfdm f9b70a2b3f6761db16a6a1c19feb2a121e11a40a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20180318
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 22f3da4c994253a74ff3fdcbb182ff48992435b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9f8560fa8ebbe4fbf6a9bdb96ecde41fa1c0a236d1a6e5c744d7c5dd5490070b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 248905
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# allow gr-gsm 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-gsm 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:#e0ffe0;'>+name gr-gfdm
</span> categories science comms
maintainers {michaelld @michaelld} openmaintainer
description Provides augmented functionality for GNU Radio: Generalized Frequency Division Multiplexing.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,51 +12,118 @@ long_description ${description}
</span> license GPL-3
platforms darwin
<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;'>+# 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_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:#ffe0e0;'>- port:fftw-3-single
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# still require cppunit for testing; NOTE: cppunit is checked for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# during configure, so we need it to be in depends_lib or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_build to be used correctly. Choose the latter since it's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# not required for runtime; just for build/test.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cppunit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup jdemel gr-gfdm df94a58da883e796c18a0a5679d4992e94158c8c
</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;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# for docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts gr37-gfdm
</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;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_build38.diff
</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;'>+ path:lib/libgnuradio-runtime.dylib:gnuradio
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix cmake building scripts
</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:#ffe0e0;'>-patchfiles-append patch-fix_build.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;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gr37-gfdm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name gr37-gfdm
</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;'>+ github.setup jdemel gr-gfdm 4cc5b5c4f3814f9e6a32c5f732412b70393127c6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch maint-3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190416-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</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;'>+ conflicts gr-gfdm
</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;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_build37.diff
</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;'>+ 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;'>-# specify the Python dependencies
</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:#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;'>+# Fetch from git instead of distfile because it needs submodules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W "${worksrcpath}" "git submodule update --init --recursive"
</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;'>+# 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:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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:swig-python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cppunit
</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:fftw-3-single \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${active_python_version_no_dot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${active_python_version_no_dot}-pybind11
</span>
# specify the Python version to use
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_framework_dir ${frameworks_dir}/Python.framework/Versions/${active_python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# unfortunately, for the moment it needs internal pybind11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# too much effort to move out only avoid installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYBIND11_INSTALL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYBIND11_TEST=OFF
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# documentation - fail -> disable
</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:#ffe0e0;'>- -DCMAKE_MODULES_DIR=${prefix}/share/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOXYGEN_DOT_EXECUTABLE= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOXYGEN_EXECUTABLE=
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-gfdm/files/patch-fix_build.diff b/science/gr-gfdm/files/patch-fix_build37.diff
</span>similarity index 85%
rename from science/gr-gfdm/files/patch-fix_build.diff
rename to science/gr-gfdm/files/patch-fix_build37.diff
<span style='display:block; white-space:pre;color:#808080;'>index 27ddb906adf..b069e3b0444 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-gfdm/files/patch-fix_build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-gfdm/files/patch-fix_build37.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e7fcd2c..72deaff 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 78d0408..ef1bfd8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,7 @@ endif()
</span> ########################################################################
# Compiler specific setup
########################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,31 +11,29 @@ index e7fcd2c..72deaff 100644
</span> #http://gcc.gnu.org/wiki/Visibility
add_definitions(-fvisibility=hidden)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,20 +116,42 @@ endif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,19 +118,41 @@ endif(APPLE)
</span> ########################################################################
# Find gnuradio build dependencies
########################################################################
-find_package(CppUnit)
-find_package(Doxygen)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> # Search for GNU Radio and its components and versions. Add any
# components required to the list of GR_REQUIRED_COMPONENTS (in all
# caps such as FILTER or FFT) and change the version to the minimum
# API compatible version required.
set(GR_REQUIRED_COMPONENTS RUNTIME FFT FILTER DIGITAL)
-find_package(Gnuradio "3.7.2" REQUIRED)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--find_package(Volk "1.3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(Volk "1.4")
</span> +find_package(Gnuradio)
+if(NOT GNURADIO_RUNTIME_FOUND)
+ message(FATAL_ERROR "GNU Radio required to compile gfdm")
+endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +find_package(CppUnit)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT CPPUNIT_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(FATAL_ERROR "CppUnit required to compile gfdm")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT CPPUNIT_FOUND)
</span> + message(FATAL_ERROR "CppUnit required to compile gr-ieee802-15-4")
+endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +find_package(PythonLibs 2)
+if(NOT PYTHONLIBS_FOUND)
+ message(FATAL_ERROR "Python required to compile gr-ieee802-15-4")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,17 +47,19 @@ index e7fcd2c..72deaff 100644
</span> +find_package(SWIG)
+if(NOT SWIG_FOUND)
+ message(FATAL_ERROR "SWIG required to compile gr-ieee802-15-4")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span> +
+find_package(FFTW3f)
+if(NOT FFTW3F_FOUND)
+ message(FATAL_ERROR "FFTW3 required to compile iqbalance")
+endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT CPPUNIT_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "CppUnit required to compile gfdm")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span> if(CMAKE_BUILD_TYPE)
if(${CMAKE_BUILD_TYPE} STREQUAL "Coverage")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- include(CodeCoverage)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,7 +162,8 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +164,8 @@ endif()
</span> ########################################################################
# Setup doxygen option
########################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ index e7fcd2c..72deaff 100644
</span> option(ENABLE_DOXYGEN "Build docs using Doxygen" ON)
else(DOXYGEN_FOUND)
option(ENABLE_DOXYGEN "Build docs using Doxygen" OFF)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,6 +180,8 @@ include_directories(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,6 +182,8 @@ include_directories(
</span> ${Boost_INCLUDE_DIRS}
${CPPUNIT_INCLUDE_DIRS}
${GNURADIO_ALL_INCLUDE_DIRS}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@ index e7fcd2c..72deaff 100644
</span> )
link_directories(
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -165,6 +190,8 @@ link_directories(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,6 +192,8 @@ link_directories(
</span> ${GNURADIO_RUNTIME_LIBRARY_DIRS}
${GNURADIO_FFT_LIBRARY_DIRS}
${GNURADIO_FILTER_LIBRARY_DIRS}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,10 +87,10 @@ index e7fcd2c..72deaff 100644
</span> )
# Set component parameters
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8b0811f..f2fe0da 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/CMakeLists.txt lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2cf94f4..2782cbb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/CMakeLists.txt
</span> @@ -22,9 +22,6 @@
########################################################################
include(GrPlatform) #define LIB_SUFFIX
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,8 +101,8 @@ index 8b0811f..f2fe0da 100644
</span> list(APPEND gfdm_sources
gfdm_utils.cc
receiver_kernel_cc.cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,13 +51,16 @@ list(APPEND gfdm_sources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- channel_estimator_cc_impl.cc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,13 +54,16 @@ list(APPEND gfdm_sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ short_burst_shaper_impl.cc)
</span>
set(gfdm_sources "${gfdm_sources}" PARENT_SCOPE)
-if(NOT gfdm_sources)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-gfdm/files/patch-fix_build38.diff b/science/gr-gfdm/files/patch-fix_build38.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7b3cc626080
</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-gfdm/files/patch-fix_build38.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b8b5c23..f0c595c 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,14 +87,7 @@ ENDIF()
</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;'>+ message(STATUS "Searching for GNU Radio installation ...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(Gnuradio "3.8" QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(NOT GNURADIO_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "Searching for GNU Radio 3.9 ...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Gnuradio "3.9" REQUIRED blocks analog fft filter digital)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "Searching for GNU Radio 3.8 ...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Gnuradio "3.8" REQUIRED blocks analog fft filter digital)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(Gnuradio REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Found GNU Radio ${Gnuradio_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(GrVersion)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +147,7 @@ endif(DOXYGEN_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(pybind11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Probably the preferred way long term:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# find_package(pybind11 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#find_package(pybind11 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND "${PYTHON_EXECUTABLE}" -c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/CMakeLists.txt lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 539c100..a0374be 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,7 @@ if(NOT gfdm_sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(NOT gfdm_sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(gnuradio-gfdm SHARED ${gfdm_sources})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(gnuradio-gfdm gnuradio::gnuradio-runtime gnuradio-digital fftw3f::fftw3f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries(gnuradio-gfdm gnuradio::gnuradio-runtime gnuradio-digital gnuradio-filter gnuradio-fft fftw3f::fftw3f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(gnuradio-gfdm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PUBLIC $<INSTALL_INTERFACE:include>
</span></pre><pre style='margin:0'>
</pre>