CVS commit: pkgsrc/math/volk

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Apr  5 11:58:57 UTC 2021

Modified Files:
        pkgsrc/math/volk: Makefile distinfo
        pkgsrc/math/volk/patches: patch-CMakeLists.txt patch-lib_CMakeLists.txt

Log Message:
volk: update to 2.4.1

Fixes build portability regressions introduced in 2.4.0


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/volk/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/volk/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/volk/patches/patch-CMakeLists.txt \
    pkgsrc/math/volk/patches/patch-lib_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/volk/Makefile
diff -u pkgsrc/math/volk/Makefile:1.4 pkgsrc/math/volk/Makefile:1.5
--- pkgsrc/math/volk/Makefile:1.4       Fri Jan  1 08:24:49 2021
+++ pkgsrc/math/volk/Makefile   Mon Apr  5 11:58:57 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2021/01/01 08:24:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2021/04/05 11:58:57 tnn Exp $
 
-DISTNAME=      volk-2.4.0
-PKGREVISION=   1
+DISTNAME=      volk-2.4.1
 CATEGORIES=    math ham
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gnuradio/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -29,5 +28,12 @@ PLIST_SUBST+=        PYSITELIB=${PYSITELIB}
 
 .include "../../devel/orc/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.if    ${MACHINE_ARCH:M*arm*} ||               \
+       ${MACHINE_ARCH} == "aarch64" ||         \
+       ${MACHINE_ARCH} == "i386" ||            \
+       ${MACHINE_ARCH} == "x86_64" ||          \
+       ${MACHINE_ARCH:M*mips*} ||              \
+       ${MACHINE_ARCH:M*powerpc*}
 .include "../../devel/cpu_features/buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/volk/distinfo
diff -u pkgsrc/math/volk/distinfo:1.2 pkgsrc/math/volk/distinfo:1.3
--- pkgsrc/math/volk/distinfo:1.2       Mon Dec 14 19:04:40 2020
+++ pkgsrc/math/volk/distinfo   Mon Apr  5 11:58:57 2021
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2020/12/14 19:04:40 tnn Exp $
+$NetBSD: distinfo,v 1.3 2021/04/05 11:58:57 tnn Exp $
 
-SHA1 (volk-2.4.0.tar.gz) = b646d1d52208045b37fc40ffbd9f07c0b04e9ce8
-RMD160 (volk-2.4.0.tar.gz) = 16de9065941f1f0948f1b019542833caa3f968f4
-SHA512 (volk-2.4.0.tar.gz) = 571974e10d664870ff949ca0e79b62905acf5baacbedc951764388dfeeeecd649eccbe60944369cfb49be1f8c67a9ebdac81e2dbeca70eabf513c6c2d32f859e
-Size (volk-2.4.0.tar.gz) = 346354 bytes
-SHA1 (patch-CMakeLists.txt) = fe0571495a1183579dda1a265819f3eb76fe9edf
+SHA1 (volk-2.4.1.tar.gz) = 86b8e9fb4749bcb4aa7b5080cad50fe12996b212
+RMD160 (volk-2.4.1.tar.gz) = 9b27ac0dbb78162f365e9162d090908e3907cdc6
+SHA512 (volk-2.4.1.tar.gz) = 11b4d6428692e759eb634adb8df5cd1603dc45def3d0985f77249fb93c364be30da9d37d325da5e455409f376a88ef2cd6d6e878a1ece4a204f0dded4fbc4d3c
+Size (volk-2.4.1.tar.gz) = 347313 bytes
+SHA1 (patch-CMakeLists.txt) = dbae634e6db7e70132dd3e62593fe8ee0ee096c7
 SHA1 (patch-include_volk_volk__common.h) = 53e7aa38deaa9cdf68ca12fff6c176be471cf162
 SHA1 (patch-include_volk_volk__complex.h) = 248bf10c03364f7338f03cbaa4ddc8047da9c775
-SHA1 (patch-lib_CMakeLists.txt) = 9cf79e37227c3de1e76610ab01ff43aa9439fcf7
+SHA1 (patch-lib_CMakeLists.txt) = feb42e616834ff1f4cec7e38c608cba7716fcf94

Index: pkgsrc/math/volk/patches/patch-CMakeLists.txt
diff -u pkgsrc/math/volk/patches/patch-CMakeLists.txt:1.1 pkgsrc/math/volk/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/math/volk/patches/patch-CMakeLists.txt:1.1   Mon Dec 14 19:04:41 2020
+++ pkgsrc/math/volk/patches/patch-CMakeLists.txt       Mon Apr  5 11:58:57 2021
@@ -1,22 +1,26 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2020/12/14 19:04:41 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2021/04/05 11:58:57 tnn Exp $
 
 Use devel/cpu_features from pkgsrc since the volk release tarball doesn't
 bundle it and we need to patch cpu_features anyway.
 
---- CMakeLists.txt.orig        2020-11-22 16:33:01.000000000 +0000
+--- CMakeLists.txt.orig        2020-12-17 15:49:06.000000000 +0000
 +++ CMakeLists.txt
-@@ -115,13 +115,7 @@ endif(MSVC)
- ########################################################################
- 
- # cpu_features
--set(BUILD_PIC ON CACHE BOOL
+@@ -122,17 +122,8 @@ else()
+   option(VOLK_CPU_FEATURES "Volk uses cpu_features" OFF)
+ endif()
+ if (VOLK_CPU_FEATURES)
+-  if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cpu_features/CMakeLists.txt" )
+-    message(FATAL_ERROR "cpu_features/CMakeLists.txt not found. Did you forget to git clone recursively?\nFix with: git submodule update --init")
+-  endif()
+   message(STATUS "Building Volk with cpu_features")
+-  set(BUILD_PIC ON CACHE BOOL
 -    "Build cpu_features with Position Independent Code (PIC)."
 -    FORCE)
--set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
--set(BUILD_SHARED_LIBS OFF)
--add_subdirectory(cpu_features)
--set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
-+find_package(CpuFeatures)
- 
- # Python
- include(VolkPython) #sets PYTHON_EXECUTABLE and PYTHON_DASH_B
+-  set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
+-  set(BUILD_SHARED_LIBS OFF)
+-  add_subdirectory(cpu_features)
+-  set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
++  find_package(CpuFeatures)
+ else()
+   message(STATUS "Building Volk without cpu_features")
+ endif()
Index: pkgsrc/math/volk/patches/patch-lib_CMakeLists.txt
diff -u pkgsrc/math/volk/patches/patch-lib_CMakeLists.txt:1.1 pkgsrc/math/volk/patches/patch-lib_CMakeLists.txt:1.2
--- pkgsrc/math/volk/patches/patch-lib_CMakeLists.txt:1.1       Mon Dec 14 19:04:41 2020
+++ pkgsrc/math/volk/patches/patch-lib_CMakeLists.txt   Mon Apr  5 11:58:57 2021
@@ -1,16 +1,16 @@
-$NetBSD: patch-lib_CMakeLists.txt,v 1.1 2020/12/14 19:04:41 tnn Exp $
+$NetBSD: patch-lib_CMakeLists.txt,v 1.2 2021/04/05 11:58:57 tnn Exp $
 
 Use devel/cpu_features from pkgsrc since the volk release tarball doesn't
 bundle it and we need to patch cpu_features anyway.
 
---- lib/CMakeLists.txt.orig    2020-11-22 16:33:01.000000000 +0000
+--- lib/CMakeLists.txt.orig    2020-12-17 15:49:06.000000000 +0000
 +++ lib/CMakeLists.txt
-@@ -511,7 +511,7 @@ target_include_directories(volk_obj
-     PRIVATE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
-     PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-     PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/kernels>
+@@ -517,7 +517,7 @@ target_include_directories(volk_obj
+ if(VOLK_CPU_FEATURES)
+   set_source_files_properties(volk_cpu.c PROPERTIES COMPILE_DEFINITIONS "VOLK_CPU_FEATURES=1")
+   target_include_directories(volk_obj
 -    PRIVATE $<TARGET_PROPERTY:cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
 +    PRIVATE $<TARGET_PROPERTY:CpuFeatures::cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
-     PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
-     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
  )
+ endif()
+