[med-svn] [Git][med-team/ray][master] 2 commits: Fix FTBFS on amd64 (OpenMPI) and MPICH architectures

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / ray


Commits:
6199468b by Andreas Tille at 2026-10-17T12:31:01+02:00
Fix FTBFS on amd64 (OpenMPI) and MPICH architectures

d/rules used 'pkg-config --libs mpi-c' which only OpenMPI registers, so
the build failed on architectures where the default MPI is MPICH
(armhf, i386) with 'mpi.h: No such file or directory' (Closes: #1150815).

The proposed fix in #1150815 switched to 'pkg-config --cflags mpi' plus
a bare '-lmpi'.  That still broke amd64: with OpenMPI's split library
layout the core symbols (e.g. ompi_mpi_byte) live in libopen_mpi, so a
bare -lmpi fails with 'DSO missing from command line'.

Query the generic 'mpi' pc file for the include path (both
implementations register it) and keep 'pkg-config --libs mpi-c'
(-> -lmpi -lopen_mpi) on OpenMPI, falling back to '-lmpi' on MPICH
where mpich.pc leaks MPICH's own build LDFLAGS.

- - - - -
4a0b3229 by Andreas Tille at 2026-10-17T12:53:03+02:00
d/watch: version=5

- - - - -


3 changed files:

- debian/changelog
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+ray (2.3.1-10) UNRELEASED; urgency=medium
+
+  * d/rules: fix the FTBFS on architectures where the default MPI is
+    MPICH (armhf, i386). (Closes: #1150815)
+    - Query pkg-config for "mpi" instead of "mpi-c", which only OpenMPI
+      registers, so mpi.h was not found with MPICH.
+    - Link with -lmpi on MPICH instead of "pkg-config --libs", as
+      mpich.pc leaks MPICH's own build LDFLAGS.
+  * d/rules: keep using "pkg-config --libs mpi-c" on OpenMPI
+    architectures (e.g. amd64).  It expands to -lmpi -lopen_mpi, and the
+    latter is required with OpenMPI's split library layout (libmpi.so no
+    longer contains the core symbols); a bare -lmpi fails there with
+    "undefined reference to ompi_mpi_byte".
+  * d/watch: version=5
+
+ -- Andreas Tille <tille at debian.org>  Sat, 17 Oct 2026 10:30:00 +0200
+
 ray (2.3.1-9) unstable; urgency=medium
 
   [ Helmut Grohne ]


=====================================
debian/rules
=====================================
@@ -7,8 +7,14 @@ include /usr/share/dpkg/buildtools.mk
 #export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CXXFLAGS_MAINT_APPEND = $(shell $(PKG_CONFIG) --cflags mpi-c)
-export DEB_LDFLAGS_MAINT_APPEND = $(shell $(PKG_CONFIG) --libs mpi-c)
+# Query the generic "mpi" pc file (provided by both OpenMPI and MPICH)
+# for the include path instead of "mpi-c", which only OpenMPI registers.
+export DEB_CXXFLAGS_MAINT_APPEND = $(shell $(PKG_CONFIG) --cflags mpi)
+# Use "mpi-c" when available (OpenMPI): it expands to -lmpi -lopen_mpi and
+# is needed with OpenMPI's split library layout.  On MPICH only "mpi.pc"
+# exists but its Libs: leaks MPICH's own build LDFLAGS, so fall back to
+# linking through the libmpi.so alternative (-lmpi) there.
+export DEB_LDFLAGS_MAINT_APPEND = $(shell $(PKG_CONFIG) --libs mpi-c 2>/dev/null || echo -lmpi)
 
 %:
 	dh $@


=====================================
debian/watch
=====================================
@@ -1,2 +1,4 @@
-version=4
-https://sf.net/denovoassembler/Ray-v?(\d[\d\.]+)\.tar\.bz2
+Version: 5
+
+Source: https://sf.net/denovoassembler/
+Matching-Pattern: Ray-v?(\d[\d\.]+)\.tar\.bz2



View it on GitLab: https://salsa.debian.org/med-team/ray/-/compare/5b64c01d700875cb4a344bdffdfeb05319c82266...4a0b3229a25e6edeb34387a66641476539ef7ec3

-- 
View it on GitLab: https://salsa.debian.org/med-team/ray/-/compare/5b64c01d700875cb4a344bdffdfeb05319c82266...4a0b3229a25e6edeb34387a66641476539ef7ec3
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/20261017/7d3e5375/attachment-0001.htm>