Your message dated Wed, 24 May 2017 16:50:12 +0000
with message-id <[email protected]>
and subject line unblock mash
has caused the Debian Bug report #863238,
regarding unblock: mash/1.1.1-2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
863238: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863238
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock mash. The version currently in unstable fixes an issue with
parallel building that sometimes leads to an FTBFS.
The changes w.r.t. v1.1.1-1 currently in testing are minimal and only
introduce the patch, which was kindly provided by Adrian Bunk.
unblock mash/1.1.1-2
Please find attached to this email a debdiff with the relevant changes.
Many thanks
Sascha
diff -Nru mash-1.1.1/debian/changelog mash-1.1.1/debian/changelog
--- mash-1.1.1/debian/changelog 2016-08-27 08:48:34.000000000 +0000
+++ mash-1.1.1/debian/changelog 2017-05-24 08:43:17.000000000 +0000
@@ -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 <[email protected]> Wed, 24 May 2017 08:43:17 +0000
+
mash (1.1.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru mash-1.1.1/debian/patches/parallel.patch
mash-1.1.1/debian/patches/parallel.patch
--- mash-1.1.1/debian/patches/parallel.patch 1970-01-01 00:00:00.000000000
+0000
+++ mash-1.1.1/debian/patches/parallel.patch 2017-05-24 08:10:13.000000000
+0000
@@ -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 <[email protected]>
+
+--- 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 -Nru mash-1.1.1/debian/patches/series mash-1.1.1/debian/patches/series
--- mash-1.1.1/debian/patches/series 2016-07-22 08:13:36.000000000 +0000
+++ mash-1.1.1/debian/patches/series 2017-05-24 08:10:13.000000000 +0000
@@ -2,3 +2,4 @@
use_debian_mathjax.patch
drop_memcpy_wrapper.patch
link_dynamically_against_capnp.patch
+parallel.patch
--- End Message ---
--- Begin Message ---
Unblocked mash.
--- End Message ---
