Source: liquid-dsp
Version: 1.7.0-1
Tags: patch
User: [email protected]
Usertags: ftcbfs

liquid-dsp regressed cross building as it now runs host code in several
places. There are a few SIMD checks that use check_c_source_runs, but
since the packaging disables SIMD, their results are not used. Skipping
the checks helps with cross building. Another aspect is running
autoscript during build. It is necessary for building tests and
benchmarks, but those are not installed into any package and cannot be
run during cross builds. Thus we may skip them as well. The attached
patch implements the proposed changes and makes liquid-dsp cross
buildable. I also verified that a native nocheck build exactly
reproduces a regular build.

Helmut
diff -Nru liquid-dsp-1.7.0/debian/changelog liquid-dsp-1.7.0/debian/changelog
--- liquid-dsp-1.7.0/debian/changelog   2025-03-15 19:38:28.000000000 +0100
+++ liquid-dsp-1.7.0/debian/changelog   2026-01-03 14:24:57.000000000 +0100
@@ -1,3 +1,12 @@
+liquid-dsp (1.7.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Skip SIMD checks when SIMD is disabled.
+    + Skip building tests and benchmarks when checks are disabled.
+
+ -- Helmut Grohne <[email protected]>  Sat, 03 Jan 2026 14:24:57 +0100
+
 liquid-dsp (1.7.0-1) unstable; urgency=medium
 
   * New upstream version 1.7.0
diff -Nru liquid-dsp-1.7.0/debian/patches/cross.patch 
liquid-dsp-1.7.0/debian/patches/cross.patch
--- liquid-dsp-1.7.0/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 
+0100
+++ liquid-dsp-1.7.0/debian/patches/cross.patch 2026-01-03 14:24:57.000000000 
+0100
@@ -0,0 +1,13 @@
+--- liquid-dsp-1.7.0.orig/CMakeLists.txt
++++ liquid-dsp-1.7.0/CMakeLists.txt
+@@ -44,7 +44,9 @@
+ find_package(PkgConfig REQUIRED)
+ 
+ # check for hardware acceleration
+-include(cmake/FindSIMD.cmake)
++if(ENABLE_SIMD)
++    include(cmake/FindSIMD.cmake)
++endif(ENABLE_SIMD)
+ pkg_check_modules(FFTW3 IMPORTED_TARGET fftw3f REQUIRED)
+ find_library(FEC_LIBRARY fec REQUIRED)
+ check_include_file(fec.h HAVE_FEC_H)
diff -Nru liquid-dsp-1.7.0/debian/patches/series 
liquid-dsp-1.7.0/debian/patches/series
--- liquid-dsp-1.7.0/debian/patches/series      2025-03-15 19:38:16.000000000 
+0100
+++ liquid-dsp-1.7.0/debian/patches/series      2026-01-03 14:21:29.000000000 
+0100
@@ -2,3 +2,4 @@
 use-fftw-lib-with-cmake
 use-fec-lib-with-cmake
 fix-chromosome-32bit
+cross.patch
diff -Nru liquid-dsp-1.7.0/debian/rules liquid-dsp-1.7.0/debian/rules
--- liquid-dsp-1.7.0/debian/rules       2025-02-24 22:31:25.000000000 +0100
+++ liquid-dsp-1.7.0/debian/rules       2026-01-03 14:24:57.000000000 +0100
@@ -10,4 +10,8 @@
        dh ${@} --buildsystem=cmake
 
 override_dh_auto_configure:
-       dh_auto_configure -- -DENABLE_SIMD=OFF -DBUILD_EXAMPLES=OFF
+       dh_auto_configure -- \
+               -DBUILD_AUTOTESTS=$(if $(filter nocheck,$(DEB_BUILD_OPTIONS) 
$(DEB_BUILD_PROFILES)),OFF,ON) \
+               -DBUILD_BENCHMARKS=$(if $(filter nocheck,$(DEB_BUILD_OPTIONS) 
$(DEB_BUILD_PROFILES)),OFF,ON) \
+               -DBUILD_EXAMPLES=OFF \
+               -DENABLE_SIMD=OFF

Reply via email to