Permalink
Browse files

volk-devel: update to dd5e293c (20190107)

Fix patches for upstream changes.
  • Loading branch information...
michaelld committed Jan 11, 2019
1 parent 0992afe commit b371f540d84e69dc253c8905fb5d088c30afb863
Showing with 24 additions and 23 deletions.
  1. +15 −14 science/volk/Portfile
  2. +9 −9 science/volk/files/patch-CMakeLists.txt.diff
@@ -33,33 +33,34 @@ if {${name} eq ${subport}} {
provides the release version, which is typically updated every month or so.
conflicts volk-devel

# fix naming of *Clang compiler to just "Clang" for internal use
patchfiles-append patch-fix-clang.diff

# 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.
patchfiles-append patch-CMakeLists.txt.diff

}

subport volk-devel {

github.setup gnuradio volk 59611a2844f748af08f7fbceab3fe4b1c1b25eee
version 20181017
checksums rmd160 9391c8dae8cd4efa11c18a3c1009f1ca386b9729 \
sha256 897a624c36c4437aa57926cb9282056a871610c129b40d31d2856bce2134acb7 \
size 252426
github.setup gnuradio volk dd5e293c85975d4db6718aef685b1a15de88a74f
version 20190107
checksums rmd160 7603df81fd3ccb257d4a13a1403027d6450251eb \
sha256 d71ca70d171935f0b1da5b23109102ed061828fddd932f45a7a0ef1918d84d45 \
size 252541
revision 0

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.

}

# 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.
patchfiles-append patch-CMakeLists.txt.diff
patch.pre_args -p1

# fix naming of *Clang compiler to just "Clang" for internal use
patchfiles-append patch-fix-clang.diff

# fix C++11 for internal use only
patchfiles-append patch-fix-cxx11.diff
patch.pre_args -p1

# override githib PortGroup homepage setting

@@ -1,11 +1,12 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 118828b..0fb0d75 100644
index 2438a40..9bfd3c5 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -474,6 +474,18 @@
@@ -448,6 +448,18 @@ else(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
endforeach()
endif(${CMAKE_VERSION} VERSION_GREATER "2.8.9")

########################################################################
+########################################################################
+# set initial include directories for finding headers
+########################################################################
+
@@ -17,11 +18,10 @@ index 118828b..0fb0d75 100644
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+########################################################################
########################################################################
# Handle orc support
########################################################################
if(ORC_FOUND)
@@ -552,24 +564,10 @@
@@ -527,24 +539,10 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11")
#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
@@ -46,7 +46,7 @@ index 118828b..0fb0d75 100644

#Configure target properties
set_target_properties(volk_obj PROPERTIES COMPILE_FLAGS "-fPIC")
@@ -586,13 +584,6 @@
@@ -561,13 +559,6 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11")
#Configure static library
if(ENABLE_STATIC_LIBS)
add_library(volk_static STATIC $<TARGET_OBJECTS:volk_obj>)
@@ -60,7 +60,7 @@ index 118828b..0fb0d75 100644

set_target_properties(volk_static PROPERTIES OUTPUT_NAME volk)

@@ -605,13 +596,6 @@
@@ -580,13 +571,6 @@ else()
#create the volk runtime library
add_library(volk SHARED ${volk_sources})
target_link_libraries(volk ${volk_libraries})
@@ -74,7 +74,7 @@ index 118828b..0fb0d75 100644
set_target_properties(volk PROPERTIES SOVERSION ${LIBVER})
set_target_properties(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")

@@ -635,6 +619,7 @@
@@ -610,6 +594,7 @@ else()
endif(ENABLE_STATIC_LIBS)

endif(CMAKE_VERSION VERSION_GREATER "2.8.11")

0 comments on commit b371f54

Please sign in to comment.