<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/ef331a60dcee6a392810b9fdeeb72757495f5421">https://github.com/macports/macports-ports/commit/ef331a60dcee6a392810b9fdeeb72757495f5421</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 ef331a6  volk-devel: update to e8f80c3c (20180204).
</span>ef331a6 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ef331a60dcee6a392810b9fdeeb72757495f5421
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Feb 7 13:55:29 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    volk-devel: update to e8f80c3c (20180204).
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Add temporary patches to fix using c++11 and Clang.
</span>---
 science/volk/Portfile                   | 14 ++++++++++----
 science/volk/files/patch-fix-clang.diff | 16 ++++++++++++++++
 science/volk/files/patch-fix-cxx11.diff | 14 ++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/Portfile b/science/volk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c3fd730..c766c33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,11 +36,11 @@ provides the release version, which is typically updated every month or so.
</span> 
 subport volk-devel {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup    gnuradio volk 6dda1a1e9545d24a1c6f0b2a5d4b5d018fdcbff9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version         20180203
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup    gnuradio volk e8f80c3c33c52199066f96e867fa74c3134cf813
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         20180204
</span>     checksums       \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        rmd160 0fadf0c51356b8519b2f01c40f2a42b760831576 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        sha256 18e463f7b2661907059b6a912ea976c5129ef9331b3077ebe1d7c8e7d4dde6c4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        rmd160 4cd8326e114fa3faf703501488f702447ef59ed7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        sha256 2aac0b166057fab500939e9212204d164c9e8c0b9c8f1ff0e2dac0fc2ccbcc32
</span> 
     conflicts       volk
     long_description ${long_description} ${subport} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +52,12 @@ provides the Volk GIT maint or master branch, depending on which is more advance
</span>     patchfiles-append patch-CMakeLists.txt.diff
     patch.pre_args -p1
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # fix naming of *Clang compiler to just "Clang" for internal use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix-clang.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # fix C++11 for internal use only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix-cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
 
 # override githib PortGroup homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-fix-clang.diff b/science/volk/files/patch-fix-clang.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8ffdf53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/files/patch-fix-clang.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0fb0d75..b7a0d68 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,6 +48,11 @@ if(MSVC) #its not set otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(COMPILER_NAME MSVC)
</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;'>++# treat Clang and AppleClang (and any other Clang) as just "Clang"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(COMPILER_NAME MATCHES ".*Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   set(COMPILER_NAME "Clang")
</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;'>+ message(STATUS "Compiler name: ${COMPILER_NAME}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT DEFINED COMPILER_NAME)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-fix-cxx11.diff b/science/volk/files/patch-fix-cxx11.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3cd6bff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/files/patch-fix-cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 34c6fdf..51dbddb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,8 @@ enable_testing()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(CMAKE_CXX_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project
</span></pre><pre style='margin:0'>

</pre>