[med-svn] [Git][med-team/abyss][master] Fix MPI build

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / abyss


Commits:
0149298f by Michael R. Crusoe at 2019-02-15T14:23:32Z
Fix MPI build

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+abyss (2.1.5-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix MPI build. Closes: #922351
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Fri, 15 Feb 2019 05:37:20 -0800
+
 abyss (2.1.5-4) unstable; urgency=medium
 
   * Fix build on hurd due to missing header file (thanks for the patch


=====================================
debian/control
=====================================
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 12~),
                libsparsehash-dev,
                libtext-multimarkdown-perl,
                libgtest-dev,
-               libsqlite3-dev
+               libsqlite3-dev,
+	       pkg-config
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/abyss
 Vcs-Git: https://salsa.debian.org/med-team/abyss.git


=====================================
debian/rules
=====================================
@@ -10,7 +10,8 @@ export DH_OPTIONS
 	dh  $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-mpi=/usr/lib/openmpi
+	dh_auto_configure -- \
+		--with-mpi=$(shell pkg-config mpi --variable=includedir | sed s=/include==)
 
 override_dh_auto_build:
 	dh_auto_build


=====================================
debian/tests/run-unit-test
=====================================
@@ -14,6 +14,8 @@ gunzip -r *
 
 abyss-pe k=25 name=test in='test-data/reads1.fastq test-data/reads2.fastq'
 
+echo Testing mpi compilation
+/usr/lib/abyss/ABYSS-P --help
 
 
 



View it on GitLab: https://salsa.debian.org/med-team/abyss/commit/0149298fc0016196f025482f8f1f61cc8b0d0632

-- 
View it on GitLab: https://salsa.debian.org/med-team/abyss/commit/0149298fc0016196f025482f8f1f61cc8b0d0632
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/20190215/aa98ed2e/attachment-0001.html>