Control: tag -1 patch
On Fri, Dec 25, 2020 at 11:08:38PM +0100, Andreas Beckmann wrote:
> You should consider using the packaged library instead of the embedded copy.
>
Hi,
Please see the patch attached.
libcpu-features-dev has another problem which is fixed 0.6.0-2, please build
with the new version.
Thanks
Shengjing Zhu
diff -Nru volk-2.4.1/debian/changelog volk-2.4.1/debian/changelog
--- volk-2.4.1/debian/changelog 2020-12-18 12:53:21.000000000 +0800
+++ volk-2.4.1/debian/changelog 2020-12-26 18:09:14.000000000 +0800
@@ -1,3 +1,10 @@
+volk (2.4.1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use system cpu_features package
+
+ -- Shengjing Zhu <z...@debian.org> Sat, 26 Dec 2020 18:09:14 +0800
+
volk (2.4.1-1) unstable; urgency=medium
* New upstream release
diff -Nru volk-2.4.1/debian/control volk-2.4.1/debian/control
--- volk-2.4.1/debian/control 2020-12-16 08:53:16.000000000 +0800
+++ volk-2.4.1/debian/control 2020-12-26 17:44:53.000000000 +0800
@@ -6,6 +6,7 @@
debhelper-compat (= 13),
dh-python,
liborc-0.4-dev,
+ libcpu-features-dev [amd64 arm64 armel armhf i386 mips64el
mipsel ppc64 ppc64el],
python3-dev,
python3-mako
Build-Depends-Indep: doxygen, graphviz
diff -Nru volk-2.4.1/debian/patches/series volk-2.4.1/debian/patches/series
--- volk-2.4.1/debian/patches/series 2020-12-18 02:51:51.000000000 +0800
+++ volk-2.4.1/debian/patches/series 2020-12-26 17:43:38.000000000 +0800
@@ -2,3 +2,4 @@
optional-static-apps
remove-external-HTML-resources
skip-cpu_features-on-kfreebsd
+use-system-cpu-features-package.patch
diff -Nru volk-2.4.1/debian/patches/use-system-cpu-features-package.patch
volk-2.4.1/debian/patches/use-system-cpu-features-package.patch
--- volk-2.4.1/debian/patches/use-system-cpu-features-package.patch
1970-01-01 08:00:00.000000000 +0800
+++ volk-2.4.1/debian/patches/use-system-cpu-features-package.patch
2020-12-26 18:06:31.000000000 +0800
@@ -0,0 +1,37 @@
+Description: use system cpu_features package
+
+Author: Shengjing Zhu <z...@debian.org>
+Last-Update: 2020-12-26
+
+--- volk-2.4.1.orig/CMakeLists.txt
++++ volk-2.4.1/CMakeLists.txt
+@@ -124,17 +124,7 @@ 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)
+ else()
+ message(STATUS "Building Volk without cpu_features")
+ endif()
+--- volk-2.4.1.orig/lib/CMakeLists.txt
++++ volk-2.4.1/lib/CMakeLists.txt
+@@ -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>
+ )
+ endif()
+
