[med-svn] [mash] 01/01: fix parallel building FTBFS

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

satta pushed a commit to branch master
in repository mash.

commit dfd27c1ad001cd9fc7f64c9739df6fc1648da115
Author: Sascha Steinbiss <satta at debian.org>
Date:   Wed May 24 08:45:13 2017 +0000

    fix parallel building FTBFS
---
 debian/changelog              |  7 +++++++
 debian/patches/parallel.patch | 20 ++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 28c91f3..503439c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mash (1.1.1-2) unstable; urgency=medium
+
+  * Fix parallel building FTBFS. Thanks to Adrian Bunk for the patch.
+    Closes: #863208
+
+ -- Sascha Steinbiss <satta at debian.org>  Wed, 24 May 2017 08:43:17 +0000
+
 mash (1.1.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/parallel.patch b/debian/patches/parallel.patch
new file mode 100644
index 0000000..9cffb05
--- /dev/null
+++ b/debian/patches/parallel.patch
@@ -0,0 +1,20 @@
+Description: Fix parallel build failures
+ "capnp compile" ran twice, and in parallel builds twice in parallel.
+ This resulted in occasional build failures caused by corrupt output files.
+ .
+ Fix the Makefile to only run "capnp compile" once.
+Author: Adrian Bunk <bunk at debian.org>
+
+--- mash-1.1.1.orig/Makefile.in
++++ mash-1.1.1/Makefile.in
+@@ -46,7 +46,9 @@ libmash.a : $(OBJECTS)
+ %.o : %.c++
+ 	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+-src/mash/capnp/MinHash.capnp.c++ src/mash/capnp/MinHash.capnp.h : src/mash/capnp/MinHash.capnp
++src/mash/capnp/MinHash.capnp.c++ : src/mash/capnp/MinHash.capnp.h
++
++src/mash/capnp/MinHash.capnp.h : src/mash/capnp/MinHash.capnp
+ 	cd src/mash/capnp;export PATH=@capnp@/bin/:${PATH};capnp compile -I @capnp@/include -oc++ MinHash.capnp
+ 
+ install : mash
diff --git a/debian/patches/series b/debian/patches/series
index 6776cfe..17700a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ hardening.patch
 use_debian_mathjax.patch
 drop_memcpy_wrapper.patch
 link_dynamically_against_capnp.patch
+parallel.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mash.git