[med-svn] [Git][med-team/mrtrix3][master] 4 commits: d/rules: Honor parallel=n in DEB_BUILD_OPTIONS. Closes: #1114645.

[Santiago Vila (@sanvila)]

Santiago Vila pushed to branch master at Debian Med / mrtrix3


Commits:
ec203783 by Santiago Vila at 2026-10-22T01:05:00+02:00
d/rules: Honor parallel=n in DEB_BUILD_OPTIONS. Closes: #1114645.

- - - - -
ae050fa6 by Santiago Vila at 2026-10-22T01:10:00+02:00
configure: make the OpenMP check independent of CPU count. Closes: #1151587.

- - - - -
50682b0e by Santiago Vila at 2026-10-22T01:15:00+02:00
d/rules: Use rm -f instead of ignoring errors on plain rm.

- - - - -
a9df372c by Santiago Vila at 2026-10-22T01:20:00+02:00
Upload for unstable as 3.0.8-4

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/eigen5-openmp.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+mrtrix3 (3.0.8-4) unstable; urgency=medium
+
+  * Team upload.
+  * Honor parallel=n in DEB_BUILD_OPTIONS. Closes: #1114645.
+  * Allow building the package on machines with less than 4 CPUs.
+    Closes: #1151587.
+  * Use "rm -f" to clean things in debian/rules.
+
+ -- Santiago Vila <sanvila at debian.org>  Thu, 22 Oct 2026 01:20:00 +0200
+
 mrtrix3 (3.0.8-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/eigen5-openmp.patch
=====================================
@@ -0,0 +1,28 @@
+From: Santiago Vila <sanvila at debian.org>
+Subject: configure: make the OpenMP check independent of CPU count
+Bug-Debian: https://bugs.debian.org/1151587
+
+Eigen 5.0 caps Eigen::setNbThreads() to omp_get_max_threads(), so the
+runtime test Eigen::nbThreads() == 4 spuriously fails on machines with
+fewer than 4 usable threads.
+
+Use EIGEN_HAS_OPENMP instead to check that Eigen's OpenMP code path is enabled.
+
+--- a/configure
++++ b/configure
+@@ -1137,11 +1137,12 @@
+   ld_flags  += [ '-fopenmp' ]
+   compile_check ('OpenMP support', 'OpenMP', cpp_flags + eigen_cflags, ld_flags, '''
+     #include <Eigen/Core>
++    #ifndef EIGEN_HAS_OPENMP
++      #error "Eigen was compiled without OpenMP support"
++    #endif
+     int main()
+     {
+-      Eigen::initParallel();
+-      Eigen::setNbThreads(4);
+-      return (Eigen::nbThreads() == 4) ? 0 : 1;
++      return 0;
+     }
+     ''')
+ 


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ python3.patch
 mrtrix_version.patch
 libeigen5.0.patch
 eigen-jacobisvd-signature.patch
+eigen5-openmp.patch


=====================================
debian/rules
=====================================
@@ -18,6 +18,7 @@ export CFLAGS+=$(CPPFLAGS) $(CXXFLAGS)
 export LINKFLAGS=$(LDFLAGS)
 
 include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/buildopts.mk
 # guarantee the same precision on x86 platforms for tests
 ifneq (,$(findstring z$(DEB_HOST_ARCH)z,zamd64z zi386z))
     CFLAGS+=-mmmx -msse -msse2 -mfpmath=sse
@@ -29,6 +30,11 @@ export  https_proxy=http://127.0.0.1:9/
 
 export QT_SELECT=qt5
 
+ifneq (,$(DEB_BUILD_OPTION_PARALLEL))
+  NUMBER_OF_PROCESSORS := $(lastword $(DEB_BUILD_OPTION_PARALLEL))
+  export NUMBER_OF_PROCESSORS
+endif
+
 %:
 	dh $@
 
@@ -73,7 +79,7 @@ override_dh_compress:
 override_dh_clean:
 	[ -f config ] && python3 ./build clean || true
 	find . -name '*.pyc' -delete
-	-rm clean \
+	rm -f clean \
 		config configure.log build.log \
 		core/version.cpp lib/mrtrix3/_version.py src/exec_version.cpp \
 		icons/mrview.qrc icons/shview.qrc



View it on GitLab: https://salsa.debian.org/med-team/mrtrix3/-/compare/230a875caf11f740554948114f11b04271787d4b...a9df372c1236211414e21ccf29edc48de0e6400a

-- 
View it on GitLab: https://salsa.debian.org/med-team/mrtrix3/-/compare/230a875caf11f740554948114f11b04271787d4b...a9df372c1236211414e21ccf29edc48de0e6400a
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/20261021/053fcd68/attachment-0001.htm>