[med-svn] [Git][med-team/ray][master] 3 commits: Fix FTCBFS: Compute mpi compile flags using pkgconf

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / ray


Commits:
3468ac79 by Andreas Tille at 2024-12-02T16:37:25+01:00
Fix FTCBFS: Compute mpi compile flags using pkgconf

- - - - -
3ddfacd3 by Andreas Tille at 2024-12-02T16:37:39+01:00
Standards-Version: 4.7.0 (routine-update)

- - - - -
ccd42b93 by Andreas Tille at 2024-12-02T16:43:10+01:00
routine-update: Ready to upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+ray (2.3.1-8.1) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Compute mpi compile flags using pkgconf. (Closes: #1085491)
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.7.0 (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Mon, 02 Dec 2024 16:37:51 +0100
+
 ray (2.3.1-8) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -7,8 +7,9 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                zlib1g-dev,
                libbz2-dev,
-               mpi-default-dev
-Standards-Version: 4.6.2
+               mpi-default-dev,
+               pkgconf,
+Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/med-team/ray
 Vcs-Git: https://salsa.debian.org/med-team/ray.git
 Homepage: https://denovoassembler.sourceforge.net/


=====================================
debian/rules
=====================================
@@ -1,10 +1,14 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/dpkg/buildtools.mk
+
 # Uncomment this to turn on verbose mode.
 #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)
 
 %:
 	dh $@
@@ -15,7 +19,7 @@ override_dh_auto_clean:
 	rm -f README.Ray README.RayPlatform RayPlatform/README
 
 override_dh_auto_build:
-	dh_auto_build -- CXXFLAGS="$(CXXFLAGS)" DEBLDFLAGS="$(LDFLAGS) -lpthread" HAVE_LIBBZ2=y HAVE_LIBZ=y
+	dh_auto_build -- MPICXX='$(CXX)' CXXFLAGS="$(CXXFLAGS)" DEBLDFLAGS="$(LDFLAGS) -lpthread" HAVE_LIBBZ2=y HAVE_LIBZ=y
 	#Rename 2 docs to make more sence in package context
 	cp README.md README.Ray
 	cp RayPlatform/README.md README.RayPlatform



View it on GitLab: https://salsa.debian.org/med-team/ray/-/compare/1fee5187c605be0cbcc42d2b02f82dd7aa80a100...ccd42b931dfff7c0aa268b731b78dc1341288b50

-- 
View it on GitLab: https://salsa.debian.org/med-team/ray/-/compare/1fee5187c605be0cbcc42d2b02f82dd7aa80a100...ccd42b931dfff7c0aa268b731b78dc1341288b50
You're receiving this email because of your account on salsa.debian.org.


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