[med-svn] [Git][med-team/relion][debian/master] 3 commits: Fix FTBFS on GNU/Hurd.

Yavor Doganov (@yavor-guest) gitlab at salsa.debian.org
Wed Nov 4 08:23:42 GMT 2026



Yavor Doganov pushed to branch debian/master at Debian Med / relion


Commits:
244183d9 by Yavor Doganov at 2026-11-04T08:44:57+02:00
Fix FTBFS on GNU/Hurd.

- - - - -
5639be96 by Yavor Doganov at 2026-11-04T10:09:50+02:00
Enable acceleration on all 64-bit GNU/Linux architectures.

- - - - -
6a74c037 by Yavor Doganov at 2026-11-04T10:13:21+02:00
(Build-Depends): Annotate python3 with :any.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/patches/hurd.patch
- + debian/patches/onetbb-link.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+relion (5.1.1+ds-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * debian/patches/hurd.patch: New; fix FTBFS on GNU/Hurd.
+  * debian/patches/onetbb-link.patch: New; fix FTBFS with ALTCPU=ON.
+  * debian/rules (ACCELERATION): New variable; define to -DALTCPU=ON on
+    64-bit GNU/Linux architectures to enable acceleration.
+    (override_dh_auto_configure): Use it.
+  * debian/control (Build-Depends): Add libtbb-dev [linux-any].  Annotate
+    python3 with :any (the package is still not cross-buildable, though).
+
+ -- Yavor Doganov <yavor at gnu.org>  Wed, 04 Nov 2026 08:44:12 +0200
+
 relion (5.1.1+ds-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -13,9 +13,10 @@ Build-Depends:
  libfftw3-dev,
  libfltk1.3-dev,
  libpng-dev,
+ libtbb-dev [linux-any],
  libtiff-dev,
  mpi-default-dev,
- python3,
+ python3:any,
 Vcs-Browser: https://salsa.debian.org/med-team/relion
 Vcs-Git: https://salsa.debian.org/med-team/relion.git
 Homepage: https://www2.mrc-lmb.cam.ac.uk/relion/index.php/Main_Page


=====================================
debian/patches/hurd.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Fix FTBFS on GNU/Hurd.
+ Suboptimal fix.  We cannot use realpath with a NULL second argument
+ (as usually done on GNU/Hurd) because the method actually uses the
+ result stored there if realpath fails.
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: no
+Last-Update: 2026-11-04
+---
+
+--- relion.orig/src/filename.cpp
++++ relion/src/filename.cpp
+@@ -46,6 +46,10 @@
+ #include "src/funcs.h"
+ #include <unistd.h>
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ // Constructor with root, number and extension .............................
+ void FileName::compose(const std::string &str, long int no, const std::string &ext, int numberlength)
+ {


=====================================
debian/patches/onetbb-link.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Fix FTBFS with -DALTCPU=ON.
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: no
+Last-Update: 2026-11-04
+---
+
+--- relion.orig/src/apps/CMakeLists.txt
++++ relion/src/apps/CMakeLists.txt
+@@ -216,6 +216,10 @@
+ 	endif(GUI)
+ endif()
+ 
++if(ALTCPU)
++        target_link_libraries(relion_lib PUBLIC ${TBB_LIBRARIES})
++endif(ALTCPU)
++
+ # FFTW_LIBRARIES is used even with MKLFFT.
+ # This is empty for ICC.
+ # See https://github.com/3dem/relion/issues/958#issuecomment-1498521352.


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,5 @@ python3.patch
 system-eigen.patch
 private-libs.patch
 tests-catch2.patch
+hurd.patch
+onetbb-link.patch


=====================================
debian/rules
=====================================
@@ -25,11 +25,19 @@ CONFIGURE_COMMON := \
   -DPYTHON_EXE_PATH=/usr/bin/python3 \
   -DCMAKE_SKIP_RPATH=TRUE
 
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+  ifeq ($(DEB_HOST_ARCH_BITS),64)
+    ACCELERATION := -DALTCPU=ON
+  endif
+endif
+
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(CONFIGURE_COMMON) -DGUI=ON -DCUDA=OFF
+# ALTCPU and CUDA are mutually exclusive options.
+	dh_auto_configure -- $(CONFIGURE_COMMON) -DGUI=ON \
+	  $(ACCELERATION) -DCUDA=OFF
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp/cli



View it on GitLab: https://salsa.debian.org/med-team/relion/-/compare/6ab535374ecdda0d1e04de054dfdec232c8f00a1...6a74c0375c7e96b2baa447eb652f32c22c4ea00f

-- 
View it on GitLab: https://salsa.debian.org/med-team/relion/-/compare/6ab535374ecdda0d1e04de054dfdec232c8f00a1...6a74c0375c7e96b2baa447eb652f32c22c4ea00f
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261104/d0e1f4db/attachment-0001.htm>


More information about the debian-med-commit mailing list