<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/96c6e5b34514fb0aad268ec9d17b9ca6278b50a7">https://github.com/macports/macports-ports/commit/96c6e5b34514fb0aad268ec9d17b9ca6278b50a7</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 96c6e5b volk-devel: update to 20190520-3880e37c
</span>96c6e5b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 96c6e5b34514fb0aad268ec9d17b9ca6278b50a7
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue May 21 21:07:31 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> volk-devel: update to 20190520-3880e37c
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix patches to be clean;
</span><span style='display:block; white-space:pre;color:#404040;'> * Split patch between release and level versions;
</span><span style='display:block; white-space:pre;color:#404040;'> * add patch to fix Volk CMake finding to provide expected variables.
</span>---
science/volk/Portfile | 31 +++++++++---------
science/volk/files/patch-CMakeLists.txt.diff | 10 +++---
...ch-cmake_Modules_VolkConfig.cmake.in.devel.diff | 37 ++++++++++++++++++++++
...h-fix-cxx11.diff => patch-fix-cxx11.devel.diff} | 5 ++-
...fix-cxx11.diff => patch-fix-cxx11.release.diff} | 0
5 files changed, 60 insertions(+), 23 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 53912c5..b57a43b 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;'>@@ -33,40 +33,41 @@ if {${name} eq ${subport}} {
</span> provides the release version, which is typically updated every month or so.
conflicts volk-devel
<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.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # fix include_directories ordering so-as to pick up project
# headers before external headers. allows for in-place building
# while a prior version is already installed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patchfiles-append patch-CMakeLists.txt.diff
</span>
}
subport volk-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio volk c0a8c1020c700a677378fc0612ee5741835b7829
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190308
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6111b2f88febfa9ebf4026293602574520d34c67 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7d79a7227454ba549a3686ea5c5474d967b38b4a5e06f2955af749d69d69daa0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 252708
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio volk 3880e37cdc57d6f249e00b74ab7f8e0af8ffc5c7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190520-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 8c16e7e99c91fbbe20706c72e54557ce249a548a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9ae308a0d248cedb1d2d60ab32df1010eafb5da2a7864ba666f59220f866924d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 253766
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts volk
long_description ${long_description} ${subport} \
provides the Volk GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to revert moving to "modern cmake" targets since
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # GNU Radio hasn't been updated yet to modern cmake and thus will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not find the updated Volk. remove this patch when GNU Radio has
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # been updated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix the find_package script to set FOUND_VOLK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # as well as provide old-style settings for projects that have yet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to be updated to new-style CMake targets.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-cmake_Modules_VolkConfig.cmake.in.devel.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-revert-modern-cmake.devel.diff
</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.devel.diff
</span>
}
# fix naming of *Clang compiler to just "Clang" for internal use
patchfiles-append patch-fix-clang.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix C++11 for internal use only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-cxx11.diff
</span> patch.pre_args -p1
# override githib PortGroup homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-CMakeLists.txt.diff b/science/volk/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2cfaca4..7d7b001 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
</span> index 2438a40..9bfd3c5 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -448,6 +448,18 @@ else(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -443,6 +443,18 @@
</span> endforeach()
endif(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ index 2438a40..9bfd3c5 100644
</span> ########################################################################
# Handle orc support
########################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -527,24 +539,10 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -522,24 +534,10 @@
</span> #Create a volk object library (requires cmake >= 2.8.8)
add_library(volk_obj OBJECT ${volk_sources})
# a better cmake-fu user may make this more repeatable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ index 2438a40..9bfd3c5 100644
</span>
#Configure target properties
set_target_properties(volk_obj PROPERTIES COMPILE_FLAGS "-fPIC")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -561,13 +559,6 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -556,13 +554,6 @@
</span> #Configure static library
if(ENABLE_STATIC_LIBS)
add_library(volk_static STATIC $<TARGET_OBJECTS:volk_obj>)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@ index 2438a40..9bfd3c5 100644
</span>
set_target_properties(volk_static PROPERTIES OUTPUT_NAME volk)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -580,13 +571,6 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -575,13 +566,6 @@
</span> #create the volk runtime library
add_library(volk SHARED ${volk_sources})
target_link_libraries(volk ${volk_libraries})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ index 2438a40..9bfd3c5 100644
</span> set_target_properties(volk PROPERTIES SOVERSION ${LIBVER})
set_target_properties(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -610,6 +594,7 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -605,6 +589,7 @@
</span> endif(ENABLE_STATIC_LIBS)
endif(CMAKE_VERSION VERSION_GREATER "2.8.11")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-cmake_Modules_VolkConfig.cmake.in.devel.diff b/science/volk/files/patch-cmake_Modules_VolkConfig.cmake.in.devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d66a590
</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-cmake_Modules_VolkConfig.cmake.in.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/Modules/VolkConfig.cmake.in b/cmake/Modules/VolkConfig.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 29d3d13..d065464 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/Modules/VolkConfig.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/Modules/VolkConfig.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,3 +3,32 @@ get_filename_component(VOLK_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT TARGET Volk::volk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include("${VOLK_CMAKE_DIR}/VolkTargets.cmake")
</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;'>++# set VOLK_FOUND to be set globally, for whether a compatible Volk was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# found -- could be a correct enough version or any version depending
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# on how find_package was called.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT TARGET Volk::volk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(VOLK_FOUND FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(VOLK_FOUND TRUE)
</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;'>++# cache whether a compatible Volk was found for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# use anywhere in the calling project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(VOLK_FOUND ${VOLK_FOUND} CACHE BOOL "Whether a compatible Volk was found" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(VOLK_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # use the new target library, regardless of whether new or old style
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # we still need to set a variable with the library name so that there
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # is a variable to reference in the using-project's cmake scripts!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(VOLK_LIBRARIES Volk::volk CACHE STRING "Volk Library" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # INTERFACE_INCLUDE_DIRECTORIES should always be set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_target_property(VOLK_INCLUDE_DIRS Volk::volk INTERFACE_INCLUDE_DIRECTORIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(VOLK_INCLUDE_DIRS ${VOLK_INCLUDE_DIRS} CACHE STRING "Volk Include Directories" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # for backward compatibility with old-CMake non-target project finding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package_handle_standard_args(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mark_as_advanced(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(VOLK_FOUND)
</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.devel.diff
</span>similarity index 82%
copy from science/volk/files/patch-fix-cxx11.diff
copy to science/volk/files/patch-fix-cxx11.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>index 3cd6bff..019cf3f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/files/patch-fix-cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/files/patch-fix-cxx11.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,13 @@
</span> diff --git a/CMakeLists.txt b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 34c6fdf..51dbddb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d6b8478..2c5d980 100644
</span> --- a/CMakeLists.txt
+++ b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,8 @@ enable_testing()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@ enable_testing()
</span>
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
+#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(CMAKE_CXX_STANDARD 11)
</span>
set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-project
set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project
<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.release.diff
</span>similarity index 100%
rename from science/volk/files/patch-fix-cxx11.diff
rename to science/volk/files/patch-fix-cxx11.release.diff
</pre><pre style='margin:0'>
</pre>