<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/ae7ebe71f9b18a875fc1234d4e3b6cd92e714391">https://github.com/macports/macports-ports/commit/ae7ebe71f9b18a875fc1234d4e3b6cd92e714391</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 ae7ebe7 [volk-]gnss-sdr: Fix building
</span>ae7ebe7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ae7ebe71f9b18a875fc1234d4e3b6cd92e714391
</span>Author: Carles Fernandez <carles.fernandez@gmail.com>
AuthorDate: Sat May 25 17:00:17 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> [volk-]gnss-sdr: Fix building
</span>---
science/gnss-sdr/Portfile | 44 +++++++++++++++++-----
science/gnss-sdr/files/patch-boost-asio.diff | 25 ++++++++++++
.../gnss-sdr/files/patch-fix-gnuradio-version.diff | 13 +++++++
science/volk-gnss-sdr/Portfile | 36 ++++++++++++------
4 files changed, 98 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnss-sdr/Portfile b/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d40dfd3..3b40506 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup cmake 1.0
</span> PortGroup github 1.0
PortGroup active_variants 1.1
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
name gnss-sdr
maintainers {michaelld @michaelld} {gmail.com:carles.fernandez @carlesfernandez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +17,19 @@ platforms darwin
</span>
dist_subdir gnss-sdr
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Requires C++14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 602} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc-4.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apple-gcc-4.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-dragonegg-*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} eq "gnss-sdr"} {
long_description ${description}: \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +39,7 @@ if {${subport} eq "gnss-sdr"} {
</span> checksums rmd160 733c3211b163825be36db80d89f9fb0db0051264 \
sha256 d44b32fd2bbdc703097e2368281d77ad4e2c42ec7c76c6e7ef100b014a716e3e \
size 3575803
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
conflicts gnss-sdr-devel gnss-sdr-next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +47,14 @@ if {${subport} eq "gnss-sdr"} {
</span>
require_active_variants port:gnuradio uhd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fixes building with Boost Asio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-boost-asio.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Temporary patch that fixes GNU Radio version detection when it is > 3.7.14 but < 3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-gnuradio-version.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
subport gnss-sdr-devel {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +68,7 @@ subport gnss-sdr-devel {
</span> checksums rmd160 733c3211b163825be36db80d89f9fb0db0051264 \
sha256 d44b32fd2bbdc703097e2368281d77ad4e2c42ec7c76c6e7ef100b014a716e3e \
size 3575803
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
conflicts gnss-sdr gnss-sdr-next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,23 +76,27 @@ subport gnss-sdr-devel {
</span>
require_active_variants port:gnuradio-devel uhd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fixes building with Boost Asio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-boost-asio.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
subport gnss-sdr-next {
long_description ${description}: \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- This port is kept up with the GNSS-SDR GIT next branch, which is typically updated daily to weekly. This version of GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnuradio-next port, which represents GNU Radio GIT next branch. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently acti [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This port is kept up with the GNSS-SDR GIT next branch, which is typically updated daily to weekly. This version of GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnuradio-next subport. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnss-sdr and gnuradio ports, cleaning a [...]
</span>
name gnss-sdr-next
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr 40b7377c318ceeb72983069e23a1ba4e8908b526
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190516-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 88d5e31136871a1c865f6e62377dd216669f9876 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f775db42efd2cf75f028a11de50fea05009ad7a7ed803077d7971d1bd9fbd7fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3689595
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr d13e00ba502462e4b498b7fcc0dc9f965df48edf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190523-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ee32e0d2c9666644eab648f3c37c16afc5faa8ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4bae6b37968a726a3f9a67ca0beae7691a0f20885111559d5cd6d4dca34394ff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3689496
</span> revision 0
conflicts gnss-sdr gnss-sdr-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gnuradio-next port:volk-gnss-sdr-next port:lapack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gnuradio-next port:volk-gnss-sdr-next port:lapack port:protobuf3-cpp
</span>
require_active_variants port:gnuradio-next uhd
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnss-sdr/files/patch-boost-asio.diff b/science/gnss-sdr/files/patch-boost-asio.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..be75a6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnss-sdr/files/patch-boost-asio.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-05-23 09:57:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-05-25 15:42:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -502,7 +502,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR "Fatal error: Boost (version >=${GNSSSDR_BOOST_MIN_VERSION}) required.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(${Boost_VERSION} VERSION_LESS 107000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Check if we have std::string_view
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include(CheckCXXSourceCompiles)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ check_cxx_source_compiles("
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <string_view>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { std::string_view sv; }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ has_string_view
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(${has_string_view})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_definitions(-DBOOST_ASIO_HAS_STD_STRING_VIEW=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_definitions(-DBOOST_ASIO_HAS_STD_STRING_VIEW=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</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;color:#808080;'>diff --git a/science/gnss-sdr/files/patch-fix-gnuradio-version.diff b/science/gnss-sdr/files/patch-fix-gnuradio-version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c756892
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnss-sdr/files/patch-fix-gnuradio-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-05-23 09:57:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-05-25 14:09:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1271,6 +1271,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Gnuradio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(PC_GNURADIO_RUNTIME_VERSION VERSION_LESS "3.7.99")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(PC_GNURADIO_RUNTIME_VERSION "3.7.13")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</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;color:#808080;'>diff --git a/science/volk-gnss-sdr/Portfile b/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9548743..a9e69de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup cmake 1.0
</span> PortGroup github 1.0
PortGroup active_variants 1.1
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
name volk-gnss-sdr
maintainers {michaelld @michaelld} {gmail.com:carles.fernandez @carlesfernandez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +17,19 @@ platforms darwin
</span>
dist_subdir gnss-sdr
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Requires C++14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 602} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc-4.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apple-gcc-4.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-dragonegg-*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} eq "volk-gnss-sdr"} {
long_description ${description}: \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +37,9 @@ if {${subport} eq "volk-gnss-sdr"} {
</span>
github.setup gnss-sdr gnss-sdr 0.0.10 v
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 733c3211b163825be36db80d89f9fb0db0051264 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d44b32fd2bbdc703097e2368281d77ad4e2c42ec7c76c6e7ef100b014a716e3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3575803
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 733c3211b163825be36db80d89f9fb0db0051264 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d44b32fd2bbdc703097e2368281d77ad4e2c42ec7c76c6e7ef100b014a716e3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3575803
</span>
conflicts volk-gnss-sdr-devel volk-gnss-sdr-next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,9 +53,9 @@ subport volk-gnss-sdr-devel {
</span> name volk-gnss-sdr-devel
github.setup gnss-sdr gnss-sdr 31c6b6bc1da77c9589a04d52a38d2d20edacf06e
version 20190208
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 733c3211b163825be36db80d89f9fb0db0051264 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d44b32fd2bbdc703097e2368281d77ad4e2c42ec7c76c6e7ef100b014a716e3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3575803
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 733c3211b163825be36db80d89f9fb0db0051264 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d44b32fd2bbdc703097e2368281d77ad4e2c42ec7c76c6e7ef100b014a716e3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3575803
</span>
conflicts volk-gnss-sdr volk-gnss-sdr-next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,11 +66,11 @@ subport volk-gnss-sdr-next {
</span> This port is kept up with the VOLK-GNSS-SDR GIT next branch, which is typically updated daily to weekly. This version of VOLK-GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnss-sdr-next and gnuradio-next ports. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnss-sdr and [...]
name volk-gnss-sdr-next
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr dc6876e1c98f82e5bdf9d5c11033d0a8dd09071a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190401
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b12df8770df43d3a870b79308a0255cce9e2c232 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 24363bdf71598fa22397d76787114942c7ac7e6a5ba1ca8be690c7603234bc1a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3675047
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr d13e00ba502462e4b498b7fcc0dc9f965df48edf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190523
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ee32e0d2c9666644eab648f3c37c16afc5faa8ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4bae6b37968a726a3f9a67ca0beae7691a0f20885111559d5cd6d4dca34394ff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3689496
</span>
conflicts volk-gnss-sdr volk-gnss-sdr-devel
</pre><pre style='margin:0'>
</pre>